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.c | |
| parent | 9cf1756dc6c06682b32ed7a789ceb4254b5792df (diff) | |
| parent | cbe2e3d44496ec7c6418e7e74ce917f2086a2947 (diff) | |
| download | rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.gz rsyslog-4a5a3196fbe4e5a4e9f8dea49f916462adbf3098.tar.bz2 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.c')
| -rw-r--r-- | runtime/wtp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index 649ffa5a..db6d4fcb 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -96,6 +96,7 @@ BEGINobjConstruct(wtp) /* be sure to specify the object type also in END macro! pThis->pfGetDeqBatchSize = NotImplementedDummy; pThis->pfDoWork = NotImplementedDummy; pThis->pfObjProcessed = NotImplementedDummy; + INIT_ATOMIC_HELPER_MUT(pThis->mutThrdStateChanged); ENDobjConstruct(wtp) @@ -149,6 +150,7 @@ CODESTARTobjDestruct(wtp) pthread_cond_destroy(&pThis->condThrdTrm); pthread_mutex_destroy(&pThis->mutWtp); pthread_attr_destroy(&pThis->attrThrd); + DESTROY_ATOMIC_HELPER_MUT(pThis->mutThrdStateChanged); free(pThis->pszDbgHdr); ENDobjDestruct(wtp) |