summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into v5-develRainer Gerhards2009-06-256-18/+29
|\ | | | | | | | | Conflicts: runtime/queue.c
| * named queue worker threadsRainer Gerhards2009-06-252-1/+7
| | | | | | | | ... but I don't see the name anywhere...?
| * cleanup (removed now-unused parameters)Rainer Gerhards2009-06-253-17/+17
| |
| * bugfix: subtle potential issue during queue shutdownRainer Gerhards2009-06-251-1/+1
| | | | | | | | | | ... this one could cause trouble, but I really don't think it caused any actual harm.
| * improvements/fixes in queue termination timeout handlingRainer Gerhards2009-06-254-5/+14
| | | | | | | | | | | | | | | | - 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)
* | bugfix: subtle synchronization issueRainer Gerhards2009-06-253-12/+12
| | | | | | | | | | | | This may have caused a segfault under strange circumstances (but if we just run long enough with a high enough message volume, even the strangest circumstances will occur...)
* | improvements/fixes in queue termination timeout handlingRainer Gerhards2009-06-254-5/+17
| | | | | | | | | | | | | | | | - 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)
* | Merge branch 'master' into v5-develRainer Gerhards2009-06-253-2/+7
|\| | | | | | | | | | | Conflicts: runtime/atomic.h runtime/wti.c
| * some memory accesses are now explicitely atomicRainer Gerhards2009-06-254-10/+25
| | | | | | | | | | ... as far as I think this mostly is to keep the thread debuggers happy
* | added a few atomic operationsRainer Gerhards2009-06-254-20/+28
| | | | | | | | | | mostly to get thread debugger errors clean (plus, of course, it makes things more deterministic)
* | bugfix: mutex was sometimes released when not being heldRainer Gerhards2009-06-241-4/+8
| |
* | Merge branch 'master' into v5-develRainer Gerhards2009-06-242-0/+4
|\|
| * Merge branch 'beta'Rainer Gerhards2009-06-242-0/+4
| |\
| | * Merge branch 'v4-stable' into betaRainer Gerhards2009-06-242-0/+4
| | |\
| | | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-06-242-0/+4
| | | |\
| | | | * bugfix: invalid mutex release in msg.cRainer Gerhards2009-06-242-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Detected under threading debugger, seems not to have any impact on actual deployments.
* | | | | quick and dirty fix for one race conditionRainer Gerhards2009-06-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is intentionally quick & dirty, as I would like to do some better patch, if possible. For that, I probably need the commented-out code, thus no delete.
* | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-243-15/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORTANT: this merge did NOT include the (important) changes to action.c . Consolidating them was too hard (aka "error-prone") because of the large differences in the code base. The fixes will be redone with a later commit. Conflicts: action.c configure.ac doc/manual.html
| * | | | bugfix: abort when using multiple mainMsgQueue worker threadsRainer Gerhards2009-06-241-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'omfile'Rainer Gerhards2009-06-24116-2379/+5219
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | fixed a race condition: generated msg string store must be mutex protectedRainer Gerhards2009-06-231-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ;)).
| * | | | cleanup (removed left-over from backport)v4.3.2Rainer Gerhards2009-06-241-2/+0
| | | | |
| * | | | Merge branch 'v4-stable' into betaRainer Gerhards2009-06-241-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-06-241-2/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid)Michael Biebl2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | Merge branch 'v4-stable' into betaRainer Gerhards2009-06-243-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | finishing touches for 4.2.0v4.2.0Rainer Gerhards2009-06-221-0/+1
| | | | |
| | * | | preparing for v4-stableRainer Gerhards2009-06-223-3/+3
| | | | |
| * | | | minor: prepped ChangeLog for next betaRainer Gerhards2009-06-241-1/+1
| | | | |
* | | | | updated project statusRainer Gerhards2009-06-243-11/+20
| | | | |
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-2316-231/+253
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | optimized TAG handlingRainer Gerhards2009-06-235-60/+44
| | | | |
| * | | | optimized hostname processingRainer Gerhards2009-06-236-49/+20
| | | | |
| * | | | more strict parsing of the hostname in rfc3164 modeRainer Gerhards2009-06-234-79/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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.
| * | | | prevented unneccessary apc callsRainer Gerhards2009-06-234-11/+19
| | | | |
| * | | | restored repeated message reduction processingRainer Gerhards2009-06-236-39/+69
| | | | |
| * | | | fix: previous patch aborted in release modeRainer Gerhards2009-06-231-1/+3
| | | | |
| * | | | some more optimizationsRainer Gerhards2009-06-235-19/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-224-38/+17
|\| | | |
| * | | | optimized processing of TAG message fieldRainer Gerhards2009-06-224-38/+17
| | | | |
* | | | | adapted (and improved) input batching to v5 engineRainer Gerhards2009-06-221-1/+2
| | | | |
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-224-45/+40
|\| | | |
| * | | | some more optimizations of the msg_t object (minor)Rainer Gerhards2009-06-224-45/+40
| | | | |
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-222-1/+19
|\| | | |
| * | | | reduced memory footprint / "memory leak"Rainer Gerhards2009-06-222-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | bugfix: huge memory leak in queue engineRainer Gerhards2009-06-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | (made rsyslogd unusable in production). Occured if at least one queue was in direct mode (the default for action queues).
* | | | | some post-merge cleanupRainer Gerhards2009-06-222-7/+2
| | | | |
* | | | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-2271-798/+1551
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * | | | optimized template string generationRainer Gerhards2009-06-197-91/+125
| | | | |
| * | | | switched default to keep in line with traditional syslogd behaviourRainer Gerhards2009-06-192-4/+7
| | | | |