diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-30 10:58:39 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-30 10:58:39 +0200 |
| commit | 4026000efcc736d1931785e4fa3c1fd21258fd95 (patch) | |
| tree | 198d8d2529552ef177ce22a65552ce699753a92e /runtime/queue.c | |
| parent | 658130c083b82d129f108074070e2aa198f6fa59 (diff) | |
| parent | 92c2e09d19bef9dd10d2e85a663925124d6e00e4 (diff) | |
| download | rsyslog-4026000efcc736d1931785e4fa3c1fd21258fd95.tar.gz rsyslog-4026000efcc736d1931785e4fa3c1fd21258fd95.tar.bz2 rsyslog-4026000efcc736d1931785e4fa3c1fd21258fd95.zip | |
Merge branch 'helgrind'v3.21.5
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 7e7d4152..3fae4aa7 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2092,7 +2092,6 @@ queueEnqObj(queue_t *pThis, flowControl_t flowCtlType, void *pUsr) { DEFiRet; int iCancelStateSave; - int i; struct timespec t; ISOBJ_TYPE_assert(pThis, queue); @@ -2171,17 +2170,14 @@ queueEnqObj(queue_t *pThis, flowControl_t flowCtlType, void *pUsr) finalize_it: if(pThis->qType != QUEUETYPE_DIRECT) { + /* make sure at least one worker is running. */ + queueAdviseMaxWorkers(pThis); + dbgoprint((obj_t*) pThis, "EnqueueMsg advised worker start\n"); + /* and release the mutex */ d_pthread_mutex_unlock(pThis->mut); - i = pthread_cond_signal(&pThis->notEmpty); - dbgoprint((obj_t*) pThis, "EnqueueMsg signaled condition (%d)\n", i); pthread_setcancelstate(iCancelStateSave, NULL); } - /* make sure at least one worker is running. */ - if(pThis->qType != QUEUETYPE_DIRECT) { - queueAdviseMaxWorkers(pThis); - } - RETiRet; } |