Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-26 | 16 | -240/+231 |
|\ | |||||
| * | added some basic multithreading tests to testbench | Rainer Gerhards | 2009-06-26 | 5 | -0/+80 |
| | | |||||
| * | got rid of the recursive requirement for msg_t mutex (finally!) | Rainer Gerhards | 2009-06-26 | 6 | -170/+123 |
| | | |||||
| * | some more stringbuffer optimization | Rainer Gerhards | 2009-06-25 | 5 | -71/+30 |
| | | |||||
| * | bugfix: msg_t mutex was sometimes initialized twice | Rainer Gerhards | 2009-06-25 | 1 | -1/+0 |
| | | |||||
| * | backported "clean" increment of memory trim counter (not protected by mutex) | Rainer Gerhards | 2009-06-25 | 2 | -3/+6 |
| | | |||||
* | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-25 | 6 | -18/+29 |
|\| | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | named queue worker threads | Rainer Gerhards | 2009-06-25 | 2 | -1/+7 |
| | | | | | | | | ... but I don't see the name anywhere...? | ||||
| * | cleanup (removed now-unused parameters) | Rainer Gerhards | 2009-06-25 | 3 | -17/+17 |
| | | |||||
| * | bugfix: subtle potential issue during queue shutdown | Rainer Gerhards | 2009-06-25 | 1 | -1/+1 |
| | | | | | | | | | | ... this one could cause trouble, but I really don't think it caused any actual harm. | ||||
| * | improvements/fixes in queue termination timeout handling | Rainer Gerhards | 2009-06-25 | 4 | -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 issue | Rainer Gerhards | 2009-06-25 | 3 | -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 handling | Rainer Gerhards | 2009-06-25 | 4 | -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-devel | Rainer Gerhards | 2009-06-25 | 3 | -2/+7 |
|\| | | | | | | | | | | | Conflicts: runtime/atomic.h runtime/wti.c | ||||
| * | some memory accesses are now explicitely atomic | Rainer Gerhards | 2009-06-25 | 4 | -10/+25 |
| | | | | | | | | | | ... as far as I think this mostly is to keep the thread debuggers happy | ||||
* | | added a few atomic operations | Rainer Gerhards | 2009-06-25 | 4 | -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 held | Rainer Gerhards | 2009-06-24 | 1 | -4/+8 |
| | | |||||
* | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-24 | 2 | -0/+4 |
|\| | |||||
| * | Merge branch 'beta' | Rainer Gerhards | 2009-06-24 | 2 | -0/+4 |
| |\ | |||||
| | * | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2009-06-24 | 2 | -0/+4 |
| | |\ | |||||
| | | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-06-24 | 2 | -0/+4 |
| | | |\ | |||||
| | | | * | bugfix: invalid mutex release in msg.c | Rainer Gerhards | 2009-06-24 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Detected under threading debugger, seems not to have any impact on actual deployments. | ||||
* | | | | | quick and dirty fix for one race condition | Rainer Gerhards | 2009-06-24 | 1 | -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-devel | Rainer Gerhards | 2009-06-24 | 3 | -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 threads | Rainer Gerhards | 2009-06-24 | 1 | -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 Gerhards | 2009-06-24 | 116 | -2379/+5219 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | fixed a race condition: generated msg string store must be mutex protected | Rainer Gerhards | 2009-06-23 | 1 | -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.2 | Rainer Gerhards | 2009-06-24 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2009-06-24 | 1 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-06-24 | 1 | -2/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid) | Michael Biebl | 2009-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | Merge branch 'v4-stable' into beta | Rainer Gerhards | 2009-06-24 | 3 | -3/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | finishing touches for 4.2.0v4.2.0 | Rainer Gerhards | 2009-06-22 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | preparing for v4-stable | Rainer Gerhards | 2009-06-22 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | minor: prepped ChangeLog for next beta | Rainer Gerhards | 2009-06-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | updated project status | Rainer Gerhards | 2009-06-24 | 3 | -11/+20 |
| | | | | | |||||
* | | | | | Merge branch 'omfile' into v5-devel | Rainer Gerhards | 2009-06-23 | 16 | -231/+253 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | optimized TAG handling | Rainer Gerhards | 2009-06-23 | 5 | -60/+44 |
| | | | | | |||||
| * | | | | optimized hostname processing | Rainer Gerhards | 2009-06-23 | 6 | -49/+20 |
| | | | | | |||||
| * | | | | more strict parsing of the hostname in rfc3164 mode | Rainer Gerhards | 2009-06-23 | 4 | -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 calls | Rainer Gerhards | 2009-06-23 | 4 | -11/+19 |
| | | | | | |||||
| * | | | | restored repeated message reduction processing | Rainer Gerhards | 2009-06-23 | 6 | -39/+69 |
| | | | | | |||||
| * | | | | fix: previous patch aborted in release mode | Rainer Gerhards | 2009-06-23 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | some more optimizations | Rainer Gerhards | 2009-06-23 | 5 | -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-devel | Rainer Gerhards | 2009-06-22 | 4 | -38/+17 |
|\| | | | | |||||
| * | | | | optimized processing of TAG message field | Rainer Gerhards | 2009-06-22 | 4 | -38/+17 |
| | | | | | |||||
* | | | | | adapted (and improved) input batching to v5 engine | Rainer Gerhards | 2009-06-22 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'omfile' into v5-devel | Rainer Gerhards | 2009-06-22 | 4 | -45/+40 |
|\| | | | | |||||
| * | | | | some more optimizations of the msg_t object (minor) | Rainer Gerhards | 2009-06-22 | 4 | -45/+40 |
| | | | | | |||||
* | | | | | Merge branch 'omfile' into v5-devel | Rainer Gerhards | 2009-06-22 | 2 | -1/+19 |
|\| | | | |