diff --git a/common/threads.c b/common/threads.c index c8e62eaa..97eeaf30 100644 --- a/common/threads.c +++ b/common/threads.c @@ -7,7 +7,6 @@ static int dispatch; static int workcount; static int oldpercent; -static qboolean pacifier; /* * ============= @@ -26,8 +25,7 @@ GetThreadWork_Locked__(void) percent = 50 * dispatch / workcount; if (percent != oldpercent) { oldpercent = percent; - if (pacifier) - logprint("%c", (percent % 5) ? '.' : '0' + (percent / 5)); + logprint("%c", (percent % 5) ? '.' : '0' + (percent / 5)); } ret = dispatch; @@ -89,7 +87,7 @@ ThreadUnlock(void) * ============= */ void -RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) +RunThreadsOn(int workcnt, void *(func)(void *)) { int i; DWORD *threadid; @@ -98,7 +96,6 @@ RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) dispatch = 0; workcount = workcnt; oldpercent = -1; - pacifier = showpacifier; threadid = malloc(sizeof(*threadid) * numthreads); threadhandle = malloc(sizeof(*threadhandle) * numthreads); @@ -120,8 +117,7 @@ RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) for (i = 0; i < numthreads; i++) WaitForSingleObject(threadhandle[i], INFINITE); DeleteCriticalSection(&crit); - if (pacifier) - logprint("\n"); + logprint("\n"); free(threadhandle); free(threadid); @@ -179,7 +175,7 @@ ThreadUnlock(void) * ============= */ void -RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) +RunThreadsOn(int workcnt, void *(func)(void *)) { pthread_t *threads; pthread_mutexattr_t mattrib; @@ -190,7 +186,6 @@ RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) dispatch = 0; workcount = workcnt; oldpercent = -1; - pacifier = showpacifier; status = pthread_mutexattr_init(&mattrib); if (status) @@ -235,8 +230,7 @@ RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) free(threads); free(my_mutex); - if (pacifier) - logprint("\n"); + logprint("\n"); } #endif /* USE_PTHREADS */ @@ -260,17 +254,15 @@ void ThreadUnlock(void) {} * ============= */ void -RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)) +RunThreadsOn(int workcnt, void *(func)(void *)) { dispatch = 0; workcount = workcnt; oldpercent = -1; - pacifier = showpacifier; func(0); - if (pacifier) - logprint("\n"); + logprint("\n"); } #endif diff --git a/include/common/threads.h b/include/common/threads.h index 86a380ff..cc60ac7f 100644 --- a/include/common/threads.h +++ b/include/common/threads.h @@ -11,7 +11,7 @@ int GetDefaultThreads(void); int GetMaxThreads(void); /* returns 0 if no limit specified */ int GetThreadWork(void); int GetThreadWork_Locked__(void); /* caller must take care of locking */ -void RunThreadsOn(int workcnt, qboolean showpacifier, void *(func)(void *)); +void RunThreadsOn(int workcnt, void *(func)(void *)); void ThreadLock(void); void ThreadUnlock(void); diff --git a/light/light.c b/light/light.c index 642aa53e..3426320f 100644 --- a/light/light.c +++ b/light/light.c @@ -186,7 +186,7 @@ LightWorld(void) lit_file_end = lit_filebase + 3 * (MAX_MAP_LIGHTING / 4); } - RunThreadsOn(numfaces, true, LightThread); + RunThreadsOn(numfaces, LightThread); lightdatasize = file_p - filebase; logprint("lightdatasize: %i\n", lightdatasize); } diff --git a/vis/flow.c b/vis/flow.c index dc86f21a..801fb5a3 100644 --- a/vis/flow.c +++ b/vis/flow.c @@ -489,5 +489,5 @@ BasePortalThread(void *dummy) void BasePortalVis(void) { - RunThreadsOn(numportals * 2, true, BasePortalThread); + RunThreadsOn(numportals * 2, BasePortalThread); } diff --git a/vis/vis.c b/vis/vis.c index 836df7ee..80b3d22b 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -616,7 +616,7 @@ CalcPortalVis(void) return; } - RunThreadsOn(numportals * 2, true, LeafThread); + RunThreadsOn(numportals * 2, LeafThread); if (verbose) { logprint("portalcheck: %i portaltest: %i portalpass: %i\n",