diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 17:49:06 +0200 |
| commit | 4a5a3196fbe4e5a4e9f8dea49f916462adbf3098 (patch) | |
| tree | df7750c93603d4a979188f3385c9fe4997072c7f /runtime/wtp.h | |
| parent | 9cf1756dc6c06682b32ed7a789ceb4254b5792df (diff) | |
| parent | cbe2e3d44496ec7c6418e7e74ce917f2086a2947 (diff) | |
| download | rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.gz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.xz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.zip | |
Merge branch 'v4-devel' into master
Conflicts:
runtime/Makefile.am
runtime/atomic.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
runtime/wtp.c
runtime/wtp.h
Diffstat (limited to 'runtime/wtp.h')
| -rw-r--r-- | runtime/wtp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/wtp.h b/runtime/wtp.h index 05c02a8c..baeba1a2 100644 --- a/runtime/wtp.h +++ b/runtime/wtp.h @@ -26,6 +26,7 @@ #include <pthread.h> #include "obj.h" +#include "atomic.h" /* states for worker threads. */ #define WRKTHRD_STOPPED FALSE @@ -65,6 +66,7 @@ struct wtp_s { rsRetVal (*pfDoWork)(void *pUsr, void *pWti); /* end user objects */ uchar *pszDbgHdr; /* header string for debug messages */ + DEF_ATOMIC_HELPER_MUT(mutThrdStateChanged); }; /* some symbolic constants for easier reference */ @@ -82,6 +84,7 @@ rsRetVal wtpWakeupAllWrkr(wtp_t *pThis); rsRetVal wtpCancelAll(wtp_t *pThis); rsRetVal wtpSetDbgHdr(wtp_t *pThis, uchar *pszMsg, size_t lenMsg); rsRetVal wtpShutdownAll(wtp_t *pThis, wtpState_t tShutdownCmd, struct timespec *ptTimeout); +//void wtpSetThrdStateChanged(wtp_t *pThis, int val); PROTOTYPEObjClassInit(wtp); PROTOTYPEpropSetMethFP(wtp, pfChkStopWrkr, rsRetVal(*pVal)(void*, int)); PROTOTYPEpropSetMethFP(wtp, pfRateLimiter, rsRetVal(*pVal)(void*)); |