2559 Commits

Author SHA1 Message Date
Rainer Gerhards
151c22e579 Merge branch 'beta' into master
Conflicts:
	tools/syslogd.c
2009-06-29 12:47:43 +02:00
Rainer Gerhards
8515376ac9 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
2009-06-29 12:46:00 +02:00
Rainer Gerhards
6511278082 bugfix: ssh session hangs after rsyslgod is started from it
stderr/stdout were not closed to be able to emit error messages,
but this caused ssh sessions to hang. Now we close them after the
initial initialization. See forum thread:
http://kb.monitorware.com/controlling-terminal-issues-t9875.html
2009-06-29 12:40:41 +02:00
Rainer Gerhards
4822715a6e updated testbench to new init() behavior
the deferred activation of input modules broke part of the testbench -
but this was a testbench issue, not one of the patch
2009-06-29 11:37:29 +02:00
Rainer Gerhards
6a29afc83f some cleanup 2009-06-29 11:26:18 +02:00
Michael Terry
e747478051 separate willRun and runInput calls for input modules
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-06-29 11:18:55 +02:00
Michael Terry
ba4806a704 add support for KLogPath 2009-06-29 10:58:38 +02:00
Ronny Egner
279896ebda improved omoracle documentation
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-06-27 12:36:34 +02:00
Rainer Gerhards
7ea63db2f9 optimization: propert names are now internally identified by integers 2009-06-26 15:31:40 +02:00
Rainer Gerhards
1f361c5eb9 some optimization, declared some frequently called small stringbuf functions inline 2009-06-26 14:22:00 +02:00
Rainer Gerhards
6be06d50e3 added some basic multithreading tests to testbench 2009-06-26 14:08:30 +02:00
Rainer Gerhards
d88803c8e4 got rid of the recursive requirement for msg_t mutex (finally!) 2009-06-26 13:42:52 +02:00
Rainer Gerhards
464dcf2339 some more stringbuffer optimization 2009-06-25 18:44:48 +02:00
Rainer Gerhards
07a7152ea0 bugfix: msg_t mutex was sometimes initialized twice 2009-06-25 18:23:03 +02:00
Rainer Gerhards
12dc91a157 backported "clean" increment of memory trim counter (not protected by mutex) 2009-06-25 17:09:51 +02:00
Rainer Gerhards
1f79c78597 named queue worker threads
... but I don't see the name anywhere...?
2009-06-25 16:03:28 +02:00
Rainer Gerhards
46435e2c3b cleanup (removed now-unused parameters) 2009-06-25 15:33:49 +02:00
Rainer Gerhards
b82f9ae304 bugfix: subtle potential issue during queue shutdown
... this one could cause trouble, but I really don't think it caused
any actual harm.
2009-06-25 15:29:09 +02:00
Rainer Gerhards
5af5b1e428 improvements/fixes in queue termination timeout handling
- bugfix: subtle (and usually irrelevant) issue in timout processing
  timeout could be one second too early if nanoseconds wrapped
- set a more sensible timeout for shutdow, now 1.5 seconds to complete
  processing (this also removes those cases where the shutdown message
  was not written because the termination happened before it)
2009-06-25 12:59:13 +02:00
Rainer Gerhards
d12b9e0c67 some memory accesses are now explicitely atomic
... as far as I think this mostly is to keep the thread debuggers
happy
2009-06-25 12:03:14 +02:00
Rainer Gerhards
db3d5edbe6 Merge branch 'beta' 2009-06-24 15:17:04 +02:00
Rainer Gerhards
301ac7591a Merge branch 'v4-stable' into beta 2009-06-24 15:16:51 +02:00
Rainer Gerhards
736a3631e6 Merge branch 'v3-stable' into v4-stable 2009-06-24 15:16:35 +02:00
Rainer Gerhards
af2dfd1c51 bugfix: invalid mutex release in msg.c
Detected under threading debugger, seems not to have any impact on
actual deployments.
2009-06-24 15:15:49 +02:00
Rainer Gerhards
539f33c6a0 bugfix: abort when using multiple mainMsgQueue worker threads
this bug was introduced by a recent change which was a bit too agressive
in avoiding locking. We can probably do better than with this patch, but
I think I'll move that into the v5 engine.
2009-06-24 11:40:53 +02:00
Rainer Gerhards
8eb10a7105 Merge branch 'omfile'
Conflicts:
	ChangeLog
2009-06-24 10:52:06 +02:00
Rainer Gerhards
675d46f5b5 cleanup (removed left-over from backport) v4.3.2 2009-06-24 10:29:57 +02:00
Rainer Gerhards
2533c07a70 Merge branch 'v4-stable' into beta 2009-06-24 10:15:07 +02:00
Rainer Gerhards
11cda87ede Merge branch 'v3-stable' into v4-stable 2009-06-24 10:14:56 +02:00
Michael Biebl
71c57cfa12 minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-06-24 10:14:23 +02:00
Rainer Gerhards
eece1c3cd1 Merge branch 'v4-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-06-24 10:11:41 +02:00
Rainer Gerhards
a48918cc27 minor: prepped ChangeLog for next beta 2009-06-24 10:09:57 +02:00
Rainer Gerhards
c53ca3a234 fixed a race condition: generated msg string store must be mutex protected
the string area that is used to build the string being passed to
the output module is now part of the action structure. As such,
access to it must also be guarded by the action mutex (an even more
optimal solution may be to store it in thread-local storage, but
there always must remain some room for improvement ;)).
2009-06-23 18:23:02 +02:00
Rainer Gerhards
b2fa740b9a optimized TAG handling 2009-06-23 17:14:42 +02:00
Rainer Gerhards
662ad3e4bf optimized hostname processing 2009-06-23 16:32:29 +02:00
Rainer Gerhards
86e37f70fe more strict parsing of the hostname in rfc3164 mode
... hopefully removes false positives (but may cause some trouble
with hostname parsing). For details, see this bug tracker:

  http://bugzilla.adiscon.com/show_bug.cgi?id=126

This patch is not optimal for v4 - another one will follow. The spirit
of this commit is to enable easier backporting if someone is interested
in doing so.
2009-06-23 16:14:19 +02:00
Rainer Gerhards
b1f2e53921 prevented unneccessary apc calls 2009-06-23 15:17:55 +02:00
Rainer Gerhards
b50d13a6a9 restored repeated message reduction processing 2009-06-23 14:50:03 +02:00
Rainer Gerhards
6181156b1c fix: previous patch aborted in release mode 2009-06-23 11:33:11 +02:00
Rainer Gerhards
d798f5b66f some more optimizations
- done malloc() instead of calloc() for msg_t, as we have large space
  which needs not be initialized
- shrunk syslogTime structure in the hope to get better cache and
  write performance (non-aligned data should not hurt much here)
2009-06-23 11:22:07 +02:00
Rainer Gerhards
2d548d56c2 finishing touches for 4.2.0 v4.2.0 2009-06-22 19:45:53 +02:00
Rainer Gerhards
5310ccee31 preparing for v4-stable 2009-06-22 19:22:24 +02:00
Rainer Gerhards
ce5869f7c4 optimized processing of TAG message field 2009-06-22 18:52:30 +02:00
Rainer Gerhards
221dc8a322 some more optimizations of the msg_t object (minor) 2009-06-22 18:19:10 +02:00
Rainer Gerhards
8962c6b011 reduced memory footprint / "memory leak"
Testing has shown that at least the glibc malloc() subsystem returns
memory to the OS far too late in our case. So we need to help it a bit,
by calling malloc_trim(), which will tell the alloc subsystem
to consolidate and return to the OS.
2009-06-22 17:35:16 +02:00
Rainer Gerhards
3abf567d2b optimized template string generation 2009-06-19 16:07:17 +02:00
Rainer Gerhards
953d015f44 switched default to keep in line with traditional syslogd behaviour 2009-06-19 14:25:27 +02:00
Rainer Gerhards
cbad28915a optimized action.c a bit 2009-06-19 12:39:06 +02:00
Rainer Gerhards
7b3dad877e removed pthread_testcancel() as it is no longer necessary
we usually stay long enough inside the actions, so there should be
no problem with reaching a cancellation point. Actually, if we
really need to cancel, the thread is in an output action (otherwise
it would have willingly terminated).
2009-06-19 12:10:38 +02:00
Rainer Gerhards
7a695d1714 removed uniprocessor optimization
... as it was not even optimal on uniprocessors any longer ;) I keep
the config directive in, maybe we can utilize it again at some later
point in time (questionable).
2009-06-19 12:03:56 +02:00