X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=taskqueue.c;h=e2445d43cb621dad52c831fd71576ad27656478e;hb=c69acd2dc88840d2d83f7210fcfe4233a7ff2ac3;hp=ccde49c5b37978ce40a3d932c3e6dccf62faac94;hpb=90317205c7a5050e5a3f2fb80289b53eb7253e87;p=xonotic%2Fdarkplaces.git diff --git a/taskqueue.c b/taskqueue.c index ccde49c5..e2445d43 100644 --- a/taskqueue.c +++ b/taskqueue.c @@ -1,9 +1,9 @@ #include "quakedef.h" #include "taskqueue.h" -cvar_t taskqueue_minthreads = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "taskqueue_minthreads", "0", "minimum number of threads to keep active for executing tasks"}; -cvar_t taskqueue_maxthreads = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "taskqueue_maxthreads", "32", "maximum number of threads to start up as needed based on task count"}; -cvar_t taskqueue_tasksperthread = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "taskqueue_tasksperthread", "4000", "expected amount of work that a single thread can do in a frame - the number of threads being used depends on the average workload in recent frames"}; +cvar_t taskqueue_minthreads = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "taskqueue_minthreads", "0", "minimum number of threads to keep active for executing tasks"}; +cvar_t taskqueue_maxthreads = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "taskqueue_maxthreads", "32", "maximum number of threads to start up as needed based on task count"}; +cvar_t taskqueue_tasksperthread = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "taskqueue_tasksperthread", "4000", "expected amount of work that a single thread can do in a frame - the number of threads being used depends on the average workload in recent frames"}; #define MAXTHREADS 1024 #define RECENTFRAMES 64 // averaging thread activity over this many frames to decide how many threads we need @@ -80,7 +80,7 @@ static int TaskQueue_ThreadFunc(void *d) unsigned int sleepcounter = 0; for (;;) { - qboolean quit; + qbool quit; while (s->dequeueposition != s->enqueueposition) { taskqueue_task_t *t = s->queue[s->dequeueposition % THREADTASKS]; @@ -136,7 +136,7 @@ void TaskQueue_Yield(taskqueue_task_t *t) TaskQueue_Enqueue(1, t); } -qboolean TaskQueue_IsDone(taskqueue_task_t *t) +qbool TaskQueue_IsDone(taskqueue_task_t *t) { return !!t->done; } @@ -198,7 +198,7 @@ static void TaskQueue_DistributeTasks(void) void TaskQueue_WaitForTaskDone(taskqueue_task_t *t) { - qboolean done = false; + qbool done = false; for (;;) { Thread_AtomicLock(&taskqueue_state.command_lock); @@ -210,7 +210,7 @@ void TaskQueue_WaitForTaskDone(taskqueue_task_t *t) } } -void TaskQueue_Frame(qboolean shutdown) +void TaskQueue_Frame(qbool shutdown) { int i; unsigned long long int avg;