diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 09:59:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 09:59:45 +0200 |
| commit | 9517e19b6427c295e206ece9562ce70f4a6d7044 (patch) | |
| tree | 783fa1af0c03e05f10cb3b54149b6fcba508263d /runtime/wtp.c | |
| parent | d4564f8399f4362c7e79066370049f909cef996c (diff) | |
| download | rsyslog-9517e19b6427c295e206ece9562ce70f4a6d7044.tar.gz rsyslog-9517e19b6427c295e206ece9562ce70f4a6d7044.tar.xz rsyslog-9517e19b6427c295e206ece9562ce70f4a6d7044.zip | |
preserving current changes
... in preparation for some larger changes - I need to apply some
serious design changes, as the current system does not play well
at all with ultra-reliable queues. Will do that in a totally new version.
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index 7786a656..a5836da3 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -141,7 +141,6 @@ BEGINobjDestruct(wtp) /* be sure to specify the object type also in END and CODE int i; CODESTARTobjDestruct(wtp) wtpProcessThrdChanges(pThis); /* process thread changes one last time */ -RUNLOG_STR("wtpDestruct"); /* destruct workers */ for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) @@ -263,22 +262,17 @@ wtpChkStopWrkr(wtp_t *pThis, int bLockMutex, int bLockUsrMutex) ISOBJ_TYPE_assert(pThis, wtp); -RUNLOG; BEGIN_MTX_PROTECTED_OPERATIONS(&pThis->mut, bLockMutex); if(pThis->wtpState == wtpState_SHUTDOWN_IMMEDIATE) { -RUNLOG; ABORT_FINALIZE(RS_RET_TERMINATE_NOW); } else if(pThis->wtpState == wtpState_SHUTDOWN) { ABORT_FINALIZE(RS_RET_TERMINATE_WHEN_IDLE); -RUNLOG; } -RUNLOG_VAR("%d", iRet); /* try customer handler if one was set and we do not yet have a definite result */ if(pThis->pfChkStopWrkr != NULL) { iRet = pThis->pfChkStopWrkr(pThis->pUsr, bLockUsrMutex); } -RUNLOG_VAR("%d", iRet); finalize_it: END_MTX_PROTECTED_OPERATIONS(&pThis->mut); |