diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-04 12:35:28 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-04 12:35:28 +0000 |
commit | 5ba8b2c77c3971a69bde54f3dd0ede81e641d798 (patch) | |
tree | d2d309b941d61c891e87921e063db0deffef2e16 /queue.c | |
parent | cee20af583a19ee2eb7db4664678a41dd6de11d4 (diff) | |
download | rsyslog-5ba8b2c77c3971a69bde54f3dd0ede81e641d798.tar.gz rsyslog-5ba8b2c77c3971a69bde54f3dd0ede81e641d798.tar.bz2 rsyslog-5ba8b2c77c3971a69bde54f3dd0ede81e641d798.zip |
cleanup
Diffstat (limited to 'queue.c')
-rw-r--r-- | queue.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -1416,12 +1416,10 @@ queueDequeueConsumable(queue_t *pThis, wti_t *pWti, int iCancelStateSave) * on the nail [exact value]) -- rgerhards, 2008-03-14 */ if(iQueueSize < pThis->iFullDlyMrk) { -dbgoprint((obj_t*) pThis, "queue size %d below FullDlyMrk %d\n", iQueueSize, pThis->iFullDlyMrk); pthread_cond_broadcast(&pThis->belowFullDlyWtrMrk); } if(iQueueSize < pThis->iLightDlyMrk) { -dbgoprint((obj_t*) pThis, "queue size %d below LightDlyMrk %d\n", iQueueSize, pThis->iLightDlyMrk); pthread_cond_broadcast(&pThis->belowLightDlyWtrMrk); } @@ -1455,9 +1453,9 @@ finalize_it: } -/* The rate limiter - we only need one - do we? +/* The rate limiter * -* Here we may wait if a dequeue time window is defined or if we are + * Here we may wait if a dequeue time window is defined or if we are * rate-limited. TODO: If we do so, we should also look into the * way new worker threads are spawned. Obviously, it doesn't make much * sense to spawn additional worker threads when none of them can do any @@ -1506,13 +1504,11 @@ queueRateLimiter(queue_t *pThis) dbgoprint((obj_t*) pThis, "entering rate limiter\n"); iDelay = 0; -dbgprintf("deq win from %d to %d\n", pThis->iDeqtWinFromHr, pThis->iDeqtWinToHr); if(pThis->iDeqtWinToHr != 25) { /* 25 means disabled */ /* time calls are expensive, so only do them when needed */ time(&tCurr); localtime_r(&tCurr, &m); iHrCurr = m.tm_hour; -RUNLOG_VAR("%d", iHrCurr); if(pThis->iDeqtWinToHr < pThis->iDeqtWinFromHr) { if(iHrCurr < pThis->iDeqtWinToHr || iHrCurr > pThis->iDeqtWinFromHr) { @@ -1550,7 +1546,6 @@ RUNLOG_VAR("%d", iHrCurr); srSleep(iDelay, 0); } - dbgoprint((obj_t*) pThis, "rate limiter returns with iRet %d\n", iRet); RETiRet; } |