diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
| commit | 829385ce407433af0f7679eedb09357ad4055f2e (patch) | |
| tree | 62e9576f42154c5ed29eb3a6c868a08e066e9f6f /runtime/wtp.c | |
| parent | 010060289a729dd930ac04b72237f0ca0db9ea1d (diff) | |
| parent | 0550512b28049c391be424ad518ed0debb77089e (diff) | |
| download | rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.gz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.xz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf.html
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index 9f54a9ab..04eb974f 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -206,6 +206,14 @@ wtpProcessThrdChanges(wtp_t *pThis) FINALIZE; } + /* Note: there is a left-over potential race condition below: + * pThis->bThrdStateChanged may be re-set by another thread while + * we work on it and thus the loop may terminate too early. However, + * there are no really bad effects from that so I perfer - for this + * version - to live with the problem as is. Not a good idea to + * introduce that large change into the stable branch without very + * good reason. -- rgerhards, 2009-04-02 + */ do { /* reset the change marker */ pThis->bThrdStateChanged = 0; |