diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-14 15:24:29 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-14 15:24:29 +0000 |
| commit | 16eba18af23dad76e717ae9fde5dfea31ce6f2aa (patch) | |
| tree | 411c7f7f52d2040f0df6c41d60f2bdf095d8dd4d /queue.c | |
| parent | 51ec17e88826559b493d7a57dd9cb6ea547ed3f3 (diff) | |
| download | rsyslog-16eba18af23dad76e717ae9fde5dfea31ce6f2aa.tar.gz rsyslog-16eba18af23dad76e717ae9fde5dfea31ce6f2aa.tar.xz rsyslog-16eba18af23dad76e717ae9fde5dfea31ce6f2aa.zip | |
- implemented $MainMsgQueueDiscardMark == 0 --> disable Discard logic
- implemented $MainMsgQueueSize == 0 --> no limit on queue size
Diffstat (limited to 'queue.c')
| -rw-r--r-- | queue.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -85,6 +85,9 @@ static rsRetVal qConstructFixedArray(queue_t *pThis) assert(pThis != NULL); + if(pThis->iMaxQueueSize == 0) + ABORT_FINALIZE(RS_RET_QSIZE_ZERO); + if((pThis->tVars.farray.pBuf = malloc(sizeof(void *) * pThis->iMaxQueueSize)) == NULL) { ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); } @@ -680,7 +683,7 @@ queueWorker(void *arg) */ if(iRet == RS_RET_OK) { /* do a quick check if we need to drain the queue */ - if(pThis->iQueueSize >= pThis->iDiscardMrk) { + if(pThis->iDiscardMrk > 0 && pThis->iQueueSize >= pThis->iDiscardMrk) { iRetLocal = objGetSeverity(pUsr, &iSeverity); if(iRetLocal == RS_RET_OK && iSeverity >= pThis->iDiscardSeverity) { dbgprintf("Queue 0x%lx/w%d: dequeue/queue nearly full (%d entries), " @@ -1077,7 +1080,7 @@ queueEnqObj(queue_t *pThis, void *pUsr) pthread_mutex_lock(pThis->mut); } - if(pThis->iQueueSize >= pThis->iDiscardMrk) { + if(pThis->iDiscardMrk > 0 && pThis->iQueueSize >= pThis->iDiscardMrk) { iRetLocal = objGetSeverity(pUsr, &iSeverity); if(iRetLocal == RS_RET_OK && iSeverity >= pThis->iDiscardSeverity) { dbgprintf("Queue 0x%lx: queue nearly full (%d entries), discarded severity %d message\n", @@ -1092,7 +1095,7 @@ queueEnqObj(queue_t *pThis, void *pUsr) } - while(pThis->iQueueSize >= pThis->iMaxQueueSize) { + while(pThis->iMaxQueueSize > 0 && pThis->iQueueSize >= pThis->iMaxQueueSize) { dbgprintf("Queue 0x%lx: enqueueMsg: queue FULL - waiting to drain.\n", queueGetID(pThis)); queueTimeoutComp(&t, pThis->toEnq); if(pthread_cond_timedwait (pThis->notFull, |