diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 14:49:04 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 14:49:04 +0200 |
commit | c250c50633d615ad261d8b3ff0e491f1032de5f6 (patch) | |
tree | e684746f76c4ba8086a2b7efee81c18c9e1dad16 /runtime/wtp.h | |
parent | ae7a01e137f14055f9472408d0cf3ebf9893afba (diff) | |
parent | 01adeab0cba21ad6193addf1a4e90689b507d092 (diff) | |
download | rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.gz rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.xz rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/wtp.h')
-rw-r--r-- | runtime/wtp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/wtp.h b/runtime/wtp.h index 13ebe536..0f21ac11 100644 --- a/runtime/wtp.h +++ b/runtime/wtp.h @@ -60,6 +60,7 @@ typedef struct wtp_s { int bInactivityGuard;/* prevents inactivity due to race condition */ rsRetVal (*pConsumer)(void *); /* user-supplied consumer function for dewtpd messages */ /* synchronization variables */ + pthread_mutex_t mutThrdShutdwn; /* mutex to guard thread shutdown processing */ pthread_mutex_t mut; /* mutex for the wtp's thread management */ pthread_cond_t condThrdTrm;/* signalled when threads terminate */ int bThrdStateChanged; /* at least one thread state has changed if 1 */ |