generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

White spaces.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@199 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2007-05-25 15:11:17 +00:00
parent 9bc187d4c6
commit 53766465a9
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
threadutil/src/ThreadPool.c
View File

@ -131,7 +131,7 @@ SetPriority( ThreadPriority priority )
int midPriority = 0; int midPriority = 0;
struct sched_param newPriority; struct sched_param newPriority;
pthread_getschedparam( ithread_self( ), &currentPolicy, pthread_getschedparam( ithread_self(), &currentPolicy,
&newPriority ); &newPriority );
minPriority = sched_get_priority_min( currentPolicy ); minPriority = sched_get_priority_min( currentPolicy );
maxPriority = sched_get_priority_max( currentPolicy ); maxPriority = sched_get_priority_max( currentPolicy );
@ -153,7 +153,7 @@ SetPriority( ThreadPriority priority )
newPriority.sched_priority = actPriority; newPriority.sched_priority = actPriority;
return pthread_setschedparam( ithread_self( ), currentPolicy, return pthread_setschedparam( ithread_self(), currentPolicy,
&newPriority ); &newPriority );
} }
@ -220,10 +220,8 @@ BumpPriority( ThreadPool * tp )
//starvation time //starvation time
//bump priority (add to higher priority Q) //bump priority (add to higher priority Q)
STATSONLY( tp->stats.totalJobsMQ++; STATSONLY( tp->stats.totalJobsMQ++; )
); STATSONLY( tp->stats.totalTimeMQ += diffTime; )
STATSONLY( tp->stats.totalTimeMQ += diffTime;
);
ListDelNode( &tp->medJobQ, tp->medJobQ.head.next, 0 ); ListDelNode( &tp->medJobQ, tp->medJobQ.head.next, 0 );
ListAddTail( &tp->highJobQ, tempJob ); ListAddTail( &tp->highJobQ, tempJob );
@ -241,10 +239,8 @@ BumpPriority( ThreadPool * tp )
//starvation time //starvation time
//bump priority (add to higher priority Q) //bump priority (add to higher priority Q)
STATSONLY( tp->stats.totalJobsLQ++; STATSONLY( tp->stats.totalJobsLQ++; )
); STATSONLY( tp->stats.totalTimeLQ += diffTime; )
STATSONLY( tp->stats.totalTimeLQ += diffTime;
);
ListDelNode( &tp->lowJobQ, tp->lowJobQ.head.next, 0 ); ListDelNode( &tp->lowJobQ, tp->lowJobQ.head.next, 0 );
ListAddTail( &tp->medJobQ, tempJob ); ListAddTail( &tp->medJobQ, tempJob );
@ -293,14 +289,26 @@ SetRelTimeout( struct timespec *time,
* ThreadPoolStats *stats must be valid non null stats structure * ThreadPoolStats *stats must be valid non null stats structure
*****************************************************************************/ *****************************************************************************/
#ifdef STATS #ifdef STATS
static void StatsInit( ThreadPoolStats * stats ) { static void StatsInit( ThreadPoolStats * stats )
assert( stats != NULL ); stats->totalIdleTime = 0; stats->totalJobsHQ = 0; stats->totalJobsLQ = 0; stats->totalJobsMQ = 0; stats->totalTimeHQ = 0; stats->totalTimeMQ = 0; stats->totalTimeLQ = 0; stats->totalWorkTime = 0; stats->totalIdleTime = 0; stats->avgWaitHQ = 0; //average wait in HQ {
stats->avgWaitMQ = 0; //average wait in MQ assert( stats != NULL );
stats->totalIdleTime = 0;
stats->totalJobsHQ = 0;
stats->totalJobsLQ = 0;
stats->totalJobsMQ = 0;
stats->totalTimeHQ = 0;
stats->totalTimeMQ = 0;
stats->totalTimeLQ = 0;
stats->totalWorkTime = 0;
stats->totalIdleTime = 0;
stats->avgWaitHQ = 0;
stats->avgWaitMQ = 0;
stats->avgWaitLQ = 0; stats->avgWaitLQ = 0;
stats->workerThreads = 0; stats->workerThreads = 0;
stats->idleThreads = 0; stats->idleThreads = 0;
stats->persistentThreads = 0; stats->persistentThreads = 0;
stats->maxThreads = 0; stats->totalThreads = 0;} stats->maxThreads = 0; stats->totalThreads = 0;
}
#endif #endif
/**************************************************************************** /****************************************************************************
@ -346,16 +354,16 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
* Parameters: * Parameters:
* *
*****************************************************************************/ *****************************************************************************/
static void SetSeed( ) { static void SetSeed() {
struct timeb t; struct timeb t;
ftime( &t ); ftime( &t );
#if defined(WIN32) #if defined(WIN32)
srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id( ).p ); srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id().p );
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id( ) ); srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id() );
#else #else
srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) ); srand( ( unsigned int )t.millitm + ithread_get_current_thread_id() );
#endif #endif
} }
@ -375,8 +383,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
*****************************************************************************/ *****************************************************************************/
static void *WorkerThread( void *arg ) { static void *WorkerThread( void *arg ) {
STATSONLY( time_t start = 0; STATSONLY( time_t start = 0; )
)
ThreadPoolJob *job = NULL; ThreadPoolJob *job = NULL;
ListNode *head = NULL; ListNode *head = NULL;
@ -400,10 +407,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
ithread_cond_broadcast( &tp->start_and_shutdown ); ithread_cond_broadcast( &tp->start_and_shutdown );
ithread_mutex_unlock( &tp->mutex ); ithread_mutex_unlock( &tp->mutex );
SetSeed( ); SetSeed();
STATSONLY( time( &start ); STATSONLY( time( &start ); )
);
while( 1 ) { while( 1 ) {
@ -418,12 +424,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
retCode = 0; retCode = 0;
STATSONLY( tp->stats.idleThreads++; STATSONLY( tp->stats.idleThreads++; )
); STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start ); ) //work time
STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start ); STATSONLY( time( &start ); ) // idle time
); //work time
STATSONLY( time( &start );
); //idle time
if( persistent == 1 ) { if( persistent == 1 ) {
//Persistent thread //Persistent thread
@ -431,8 +434,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
tp->persistentThreads--; tp->persistentThreads--;
} }
STATSONLY( if( persistent == 0 ) STATSONLY( if( persistent == 0 ) tp->stats.workerThreads--; )
tp->stats.workerThreads--; );
//Check for a job or shutdown //Check for a job or shutdown
while( ( tp->lowJobQ.size == 0 ) while( ( tp->lowJobQ.size == 0 )
@ -453,7 +455,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
&& ( ( tp->totalThreads ) > && ( ( tp->totalThreads ) >
tp->attr.maxThreads ) ) ) { tp->attr.maxThreads ) ) ) {
STATSONLY( tp->stats.idleThreads-- ); STATSONLY( tp->stats.idleThreads--; )
tp->totalThreads--; tp->totalThreads--;
ithread_cond_broadcast( &tp->start_and_shutdown ); ithread_cond_broadcast( &tp->start_and_shutdown );
@ -475,12 +477,9 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
} }
STATSONLY( tp->stats.idleThreads--; STATSONLY( tp->stats.idleThreads--; )
); STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start ); ) // idle time
STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start ); STATSONLY( time( &start ); ) // work time
); //idle time
STATSONLY( time( &start );
); //work time
//bump priority of starved jobs //bump priority of starved jobs
BumpPriority( tp ); BumpPriority( tp );
@ -512,34 +511,33 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
ithread_cond_broadcast( &tp->start_and_shutdown ); ithread_cond_broadcast( &tp->start_and_shutdown );
} else { } else {
STATSONLY( tp->stats.workerThreads++ ); STATSONLY( tp->stats.workerThreads++; )
persistent = 0; persistent = 0;
//Pick the highest priority job //Pick the highest priority job
if( tp->highJobQ.size > 0 ) { if( tp->highJobQ.size > 0 ) {
head = ListHead( &tp->highJobQ ); head = ListHead( &tp->highJobQ );
job = ( ThreadPoolJob * ) head->item; job = ( ThreadPoolJob * ) head->item;
STATSONLY( CalcWaitTime STATSONLY( CalcWaitTime( tp, HIGH_PRIORITY, job ); )
( tp, HIGH_PRIORITY, job ) );
ListDelNode( &tp->highJobQ, head, 0 ); ListDelNode( &tp->highJobQ, head, 0 );
} else if( tp->medJobQ.size > 0 ) { } else if( tp->medJobQ.size > 0 ) {
head = ListHead( &tp->medJobQ ); head = ListHead( &tp->medJobQ );
job = ( ThreadPoolJob * ) head->item; job = ( ThreadPoolJob * ) head->item;
STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ) ); STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ); )
ListDelNode( &tp->medJobQ, head, 0 ); ListDelNode( &tp->medJobQ, head, 0 );
} else if( tp->lowJobQ.size > 0 ) { } else if( tp->lowJobQ.size > 0 ) {
head = ListHead( &tp->lowJobQ ); head = ListHead( &tp->lowJobQ );
job = ( ThreadPoolJob * ) head->item; job = ( ThreadPoolJob * ) head->item;
STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ) ); STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ); )
ListDelNode( &tp->lowJobQ, head, 0 ); ListDelNode( &tp->lowJobQ, head, 0 );
} else { } else {
// Should never get here // Should never get here
assert( 0 ); assert( 0 );
STATSONLY( tp->stats.workerThreads-- ); STATSONLY( tp->stats.workerThreads--; )
tp->totalThreads--; tp->totalThreads--;
ithread_cond_broadcast( &tp->start_and_shutdown ); ithread_cond_broadcast( &tp->start_and_shutdown );
ithread_mutex_unlock( &tp->mutex ); ithread_mutex_unlock( &tp->mutex );
@ -644,9 +642,11 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
} }
STATSONLY( if( tp->stats.maxThreads < tp->totalThreads ) { #ifdef STATS
tp->stats.maxThreads = tp->totalThreads;} if( tp->stats.maxThreads < tp->totalThreads ) {
) tp->stats.maxThreads = tp->totalThreads;
}
#endif
return rc; return rc;
} }
@ -766,7 +766,7 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
JOBFREELISTSIZE ); JOBFREELISTSIZE );
assert( retCode == 0 ); assert( retCode == 0 );
STATSONLY( StatsInit( &tp->stats ) ); STATSONLY( StatsInit( &tp->stats ); )
retCode += ListInit( &tp->highJobQ, CmpThreadPoolJob, NULL ); retCode += ListInit( &tp->highJobQ, CmpThreadPoolJob, NULL );
assert( retCode == 0 ); assert( retCode == 0 );