diff options
| author | Michael Biebl <biebl@debian.org> | 2013-04-10 12:24:34 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-04-10 12:24:34 +0200 |
| commit | 79b9293acbb763ad949ed7878f138f424dfa85ac (patch) | |
| tree | 141c5e0b64fdfbee653542e8a0a3f6d7e3c94671 /runtime/queue.c | |
| parent | d7c2f609d30d5e4d2c69dd2dc7305bd8ec5736ec (diff) | |
| download | rsyslog-79b9293acbb763ad949ed7878f138f424dfa85ac.tar.gz | |
Imported Upstream version 7.3.10upstream/7.3.10
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 4c8d3ac..74090a4 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -991,7 +991,7 @@ rsRetVal qqueueEnqObjDirectBatch(qqueue_t *pThis, batch_t *pBatch) * We use our knowledge about the batch_t structure below, but without that, we * pay a too-large performance toll... -- rgerhards, 2009-04-22 */ - iRet = pThis->pConsumer(pThis->pAction, pBatch, &pThis->bShutdownImmediate); + iRet = pThis->pConsumer(pThis->pAction, pBatch, NULL); RETiRet; } @@ -1150,6 +1150,7 @@ tryShutdownWorkersWithinActionTimeout(qqueue_t *pThis) DBGOPRINT((obj_t*) pThis, "trying to shutdown workers within Action Timeout"); DBGOPRINT((obj_t*) pThis, "setting EnqOnly mode\n"); pThis->bEnqOnly = 1; +dbgprintf("DDDD: setting shutdownImmediate mode, ptr %p!\n", &pThis->bShutdownImmediate); pThis->bShutdownImmediate = 1; /* now DA queue */ if(pThis->bIsDA) { @@ -1291,8 +1292,6 @@ finalize_it: RETiRet; } - - /* Constructor for the queue object * This constructs the data structure, but does not yet start the queue. That * is done by queueStart(). The reason is that we want to give the caller a chance @@ -1856,6 +1855,8 @@ ConsumerReg(qqueue_t *pThis, wti_t *pWti) /* at this spot, we may be cancelled */ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &iCancelStateSave); + +dbgprintf("DDDD: calling consumer with shutdownImmeditate ptr %p\n", &pThis->bShutdownImmediate); CHKiRet(pThis->pConsumer(pThis->pAction, &pWti->batch, &pThis->bShutdownImmediate)); /* we now need to check if we should deliberately delay processing a bit |