diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:49:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:49:35 +0100 |
| commit | 55834d95c993596c10d21515c12e2676d8606ef5 (patch) | |
| tree | a0f855d8f33263c6aae6b51de78215996dd55993 | |
| parent | f5926d4c2c12affd9b7e140e38777deae83751e2 (diff) | |
| parent | 48f646c149eaabf27909be0fddb06945c162e4b2 (diff) | |
| download | rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.tar.gz rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.tar.bz2 rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.zip | |
Merge branch 'v7-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/queue.c
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | doc/lookup_tables.html | 4 |
2 files changed, 8 insertions, 8 deletions
@@ -54,7 +54,7 @@ Version 8.1.0 [devel] 2013-11-15 statement. Also, it can still be build without problems, the option must just explicitely be given. --------------------------------------------------------------------------- -Version 7.5.7 [v7-devel] 2013-11-?? +Version 7.5.7 [v7-devel] 2013-11-25 - queue defaults have changed * high water mark is now dynamically 90% of queue size * low water makr is now dynamically 70% of queue size @@ -62,6 +62,11 @@ Version 7.5.7 [v7-devel] 2013-11-?? * queue.workerThreadMinimumMessage set to queue.size / num workers For queues with very low queue.maxSize (< 100), "emergency" defaults will be used. +- worker thread pool handling has been improved + Among others, permits pool to actually shrink (was quite hard with + previous implementation. This will also improve performance and/or + lower system overhead on busy systems. + Thanks to Pavel Levshin for the enhancement. - bugfix: mmpstrucdata generated inaccessible properties - bugfix: RainerScript optimizer did not optimize PRI filters things like "if $syslogfacility-text == "local3"" were not converted @@ -82,11 +87,6 @@ Version 7.5.7 [v7-devel] 2013-11-?? is very unlikely to happen and the fix itself has some regression potential (the fix looks very solid, but it addresses a core component). Thanks to Pavel Levshin for the fix -- worker thread pool handling has been improved - Among others, permits pool to actually shrink (was quite hard with - previous implementation. This will also improve performance and/or - lower system overhead on busy systems. - Thanks to Pavel Levshin for the enhancement. - now emit warning message if om with msg passing mode uses action queue These can modify the message, and this causes races. - bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work diff --git a/doc/lookup_tables.html b/doc/lookup_tables.html index b7fcff04..e1fcd08c 100644 --- a/doc/lookup_tables.html +++ b/doc/lookup_tables.html @@ -190,8 +190,8 @@ be sufficiently secured, e.g. via TLS mutual auth. <h2>Implementation Details</h2> <p>The lookup table functionality is implemented via highly efficient algorithms. -The string lookup is based on a parse tree and has O(1) time complexity. The array -lookup is also O(1). In case of sparseArray, we have O(log n). +The string lookup has O(log n) time complexity. The array +lookup is O(1). In case of sparseArray, we have O(log n). <p>To preserve space and, more important, increase cache hit performance, equal data values are only stored once, no matter how often a lookup index points to them. <p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] |