diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/syncop.c | 5 | ||||
| -rw-r--r-- | libglusterfs/src/syncop.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c index dbc52259fe7..aa46f6219ce 100644 --- a/libglusterfs/src/syncop.c +++ b/libglusterfs/src/syncop.c @@ -89,6 +89,8 @@ synctask_yield (struct synctask *task) task->proc->sched.uc_flags &= ~_UC_TLSBASE; #endif + if (task->state != SYNCTASK_DONE) + task->state = SYNCTASK_SUSPEND; if (swapcontext (&task->ctx, &task->proc->sched) < 0) { gf_log ("syncop", GF_LOG_ERROR, "swapcontext failed (%s)", strerror (errno)); @@ -238,6 +240,7 @@ synctask_new (struct syncenv *env, synctask_fn_t fn, synctask_cbk_t cbk, newtask->gid = newtask->opframe->root->gid; INIT_LIST_HEAD (&newtask->all_tasks); + INIT_LIST_HEAD (&newtask->waitq); if (getcontext (&newtask->ctx) < 0) { gf_log ("syncop", GF_LOG_ERROR, @@ -530,6 +533,7 @@ __synclock_lock (struct synclock *lock) /* called within a synctask */ list_add_tail (&task->waitq, &lock->waitq); pthread_mutex_unlock (&lock->guard); + synctask_yawn (task); synctask_yield (task); /* task is removed from waitq in unlock, * under lock->guard.*/ @@ -686,6 +690,7 @@ __syncbarrier_wait (struct syncbarrier *barrier, int waitfor) list_add_tail (&task->waitq, &barrier->waitq); { pthread_mutex_unlock (&barrier->guard); + synctask_yawn (task); synctask_yield (task); pthread_mutex_lock (&barrier->guard); } diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h index f6eb423a4b6..d27c19d7011 100644 --- a/libglusterfs/src/syncop.h +++ b/libglusterfs/src/syncop.h @@ -208,8 +208,6 @@ struct syncargs { \ STACK_WIND_COOKIE (frame, cbk, (void *)stb, subvol, \ op, params); \ - if (task) \ - task->state = SYNCTASK_SUSPEND; \ \ __yield (stb); \ if (task) \ |