diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-25 15:51:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 15:51:49 +0100 |
| commit | afafd9e0d7b333c54613670f4b9dbe3ae90ec51d (patch) | |
| tree | 6bb07a767270e542d5ff83b784e47b2e1f460447 | |
| parent | 64ecd12021dad06df365f94f7fddd44ebfbd0eb2 (diff) | |
| download | rsyslog-afafd9e0d7b333c54613670f4b9dbe3ae90ec51d.tar.gz rsyslog-afafd9e0d7b333c54613670f4b9dbe3ae90ec51d.tar.xz rsyslog-afafd9e0d7b333c54613670f4b9dbe3ae90ec51d.zip | |
bugfix: atomic increment for msg object may not work correct on all platforms.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/msg.h | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,7 +1,9 @@ --------------------------------------------------------------------------- -Version 5.6.1 [V5-STABLE] (rgerhards), 2010-11-24 +Version 5.6.2 [V5-STABLE] (rgerhards), 2010-11-?? - bugfix: compile failed on systems without epoll_create1() Thanks to David Hill for providing a fix. +- bugfix: atomic increment for msg object may not work correct on all + platforms. Thanks to Chris Metcalf for the patch --------------------------------------------------------------------------- Version 5.6.1 [V5-STABLE] (rgerhards), 2010-11-24 - bugfix(important): problem in TLS handling could cause rsyslog to loop diff --git a/runtime/msg.h b/runtime/msg.h index d42f1de2..4897959c 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -60,8 +60,8 @@ struct msg { flowControl_t flowCtlType; /**< type of flow control we can apply, for enqueueing, needs not to be persisted because once data has entered the queue, this property is no longer needed. */ pthread_mutex_t mut; + int iRefCount; /* reference counter (0 = unused) */ sbool bDoLock; /* use the mutex? */ - short iRefCount; /* reference counter (0 = unused) */ short iSeverity; /* the severity 0..7 */ short iFacility; /* Facility code 0 .. 23*/ short offAfterPRI; /* offset, at which raw message WITHOUT PRI part starts in pszRawMsg */ |