diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:47:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:47:30 +0100 |
| commit | 48f646c149eaabf27909be0fddb06945c162e4b2 (patch) | |
| tree | 29b7e00aa47904f869f469c2023d557b5aa22861 | |
| parent | f03431a834fa74326f43095c5b41b71014ea2e70 (diff) | |
| parent | 54f41ae512ddd5c5555bcbfa49da56a72d94ad9f (diff) | |
| download | rsyslog-48f646c149eaabf27909be0fddb06945c162e4b2.tar.gz rsyslog-48f646c149eaabf27909be0fddb06945c162e4b2.tar.bz2 rsyslog-48f646c149eaabf27909be0fddb06945c162e4b2.zip | |
Merge branch 'v7-stable' into v7-devel
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/lookup_tables.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7dad8aa8..83784278 100644 --- a/configure.ac +++ b/configure.ac @@ -932,7 +932,7 @@ AC_ARG_ENABLE(mmnormalize, ) if test "x$enable_mmnormalize" = "xyes"; then PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0) - PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 0.3.1) + PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 0.3.1 lognorm < 1.0.0) fi AM_CONDITIONAL(ENABLE_MMNORMALIZE, test x$enable_mmnormalize = xyes) 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>] |