summaryrefslogtreecommitdiff
path: root/ot_mutex.c
diff options
context:
space:
mode:
authorDirk Engling <erdgeist@erdgeist.org>2007-11-18 16:46:34 +0000
committerDirk Engling <erdgeist@erdgeist.org>2007-11-18 16:46:34 +0000
commitc4e5c983a5531c052bf0f87bfb0e939ef5861da5 (patch)
tree9d99f6ccc45f1e2087be8913a9d91b685aa58d38 /ot_mutex.c
parent92f22d78fae354068dc8509369fa0bfe27bc9339 (diff)
downloadopentracker-c4e5c983a5531c052bf0f87bfb0e939ef5861da5.tar.gz
opentracker-c4e5c983a5531c052bf0f87bfb0e939ef5861da5.zip
Reflect new task-classes model in mutex queue
Diffstat (limited to 'ot_mutex.c')
-rw-r--r--ot_mutex.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/ot_mutex.c b/ot_mutex.c
index 649d3c8..a08b5ef 100644
--- a/ot_mutex.c
+++ b/ot_mutex.c
@@ -182,7 +182,7 @@ void mutex_workqueue_canceltask( int64 socket ) {
MTX_DBG( "canceltask unlocked.\n" );
}
-ot_taskid mutex_workqueue_poptask( ot_tasktype tasktype ) {
+ot_taskid mutex_workqueue_poptask( ot_tasktype *tasktype ) {
struct ot_task * task;
ot_taskid taskid = 0;
@@ -194,13 +194,14 @@ ot_taskid mutex_workqueue_poptask( ot_tasktype tasktype ) {
while( !taskid ) {
/* Skip to the first unassigned task this worker wants to do */
task = tasklist;
- while( task && ( task->tasktype != tasktype ) && ( task->taskid ) )
+ while( task && ( ( TASK_MASK & task->tasktype ) != *tasktype ) && ( task->taskid ) )
task = task->next;
/* If we found an outstanding task, assign a taskid to it
and leave the loop */
if( task ) {
task->taskid = taskid = ++next_free_taskid;
+ *tasktype = task->tasktype;
} else {
/* Wait until the next task is being fed */
MTX_DBG( "poptask cond waits.\n" );
@@ -231,7 +232,7 @@ int mutex_workqueue_pushresult( ot_taskid taskid, int iovec_entries, struct iove
if( task ) {
task->iovec_entries = iovec_entries;
task->iovec = iovec;
- task->tasktype = OT_TASKTYPE_DONE;
+ task->tasktype = TASK_DONE;
}
/* Release lock */
@@ -253,10 +254,10 @@ int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovec ) {
MTX_DBG( "popresult locked.\n" );
task = &tasklist;
- while( *task && ( (*task)->tasktype != OT_TASKTYPE_DONE ) )
+ while( *task && ( (*task)->tasktype != TASK_DONE ) )
task = &(*task)->next;
- if( *task && ( (*task)->tasktype == OT_TASKTYPE_DONE ) ) {
+ if( *task && ( (*task)->tasktype == TASK_DONE ) ) {
struct ot_task *ptask = *task;
*iovec_entries = (*task)->iovec_entries;