olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: remove pacifier argument from RunThreadsOn 

Set to true everywhere, just use it unconditionally.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-02-07 20:46:33 +10:30
parent f0d3172d77
commit 853761d0d6
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/threads.c
View File

@ -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

2
include/common/threads.h
View File

@ -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);

2
light/light.c
View File

@ -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);
}

2
vis/flow.c
View File

@ -489,5 +489,5 @@ BasePortalThread(void *dummy)
void
BasePortalVis(void)
{
RunThreadsOn(numportals * 2, true, BasePortalThread);
RunThreadsOn(numportals * 2, BasePortalThread);
}

2
vis/vis.c
View File

@ -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",