diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-26 18:40:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-26 18:40:28 +0200 |
| commit | 92c2e09d19bef9dd10d2e85a663925124d6e00e4 (patch) | |
| tree | 24d7a478dc02365b2d1fc24ab3d7ddbfe1d7cb6a /runtime/queue.c | |
| parent | b8e82d59b7aba7da65e4244a29b92274aa50d08d (diff) | |
| download | rsyslog-92c2e09d19bef9dd10d2e85a663925124d6e00e4.tar.gz rsyslog-92c2e09d19bef9dd10d2e85a663925124d6e00e4.tar.xz rsyslog-92c2e09d19bef9dd10d2e85a663925124d6e00e4.zip | |
some more threading cleanup
- removed newly-introduced potential deadlock in debug system
- removed unnecessary pthread_cond_signal
- a bit general cleanup
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index c0a37019..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); @@ -2172,13 +2171,10 @@ queueEnqObj(queue_t *pThis, flowControl_t flowCtlType, void *pUsr) finalize_it: if(pThis->qType != QUEUETYPE_DIRECT) { /* make sure at least one worker is running. */ - if(pThis->qType != QUEUETYPE_DIRECT) { - queueAdviseMaxWorkers(pThis); - } + queueAdviseMaxWorkers(pThis); + dbgoprint((obj_t*) pThis, "EnqueueMsg advised worker start\n"); /* and release the mutex */ - i = pthread_cond_signal(&pThis->notEmpty); d_pthread_mutex_unlock(pThis->mut); - dbgoprint((obj_t*) pThis, "EnqueueMsg signaled condition (%d)\n", i); pthread_setcancelstate(iCancelStateSave, NULL); } |