summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-06 18:55:30 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-06 18:55:30 +0200
commit2471dc2f1fba85b23bc5c89a9234ae320642484d (patch)
tree3e16d20518cb66c15ef21b09b606176c130443ac
parente3040285dbf0854443bc2443e0de5ac59f6f839e (diff)
parent01cdda8a65f76cc1270fa788aa0847a4d2d13ed7 (diff)
downloadrsyslog-2471dc2f1fba85b23bc5c89a9234ae320642484d.tar.gz
rsyslog-2471dc2f1fba85b23bc5c89a9234ae320642484d.tar.xz
rsyslog-2471dc2f1fba85b23bc5c89a9234ae320642484d.zip
Merge branch 'v4-beta' into v4-devel
-rw-r--r--ChangeLog2
-rw-r--r--runtime/queue.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a17f28e..0418f56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 4.5.1 [DEVEL] (rgerhards), 2009-07-??
+- performance enhancement: much faster, up to twice as fast (depending
+ on configuration)
- bugfix: abort condition when RecvFrom was not set and message reduction
was on. Happend e.g. with imuxsock.
- added $klogConsoleLogLevel directive which permits to set a new
diff --git a/runtime/queue.c b/runtime/queue.c
index 13e7007a..ddff1bcf 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1452,11 +1452,11 @@ qqueueDequeueConsumable(qqueue_t *pThis, wti_t *pWti, int iCancelStateSave)
* we have someone waiting for the condition (or only when we hit the watermark right
* on the nail [exact value]) -- rgerhards, 2008-03-14
*/
- if(iQueueSize < pThis->iFullDlyMrk) {
+ if(iQueueSize < pThis->iFullDlyMrk / 2) {
pthread_cond_broadcast(&pThis->belowFullDlyWtrMrk);
}
- if(iQueueSize < pThis->iLightDlyMrk) {
+ if(iQueueSize < pThis->iLightDlyMrk / 2) {
pthread_cond_broadcast(&pThis->belowLightDlyWtrMrk);
}