diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 14:24:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 14:24:37 +0200 |
| commit | 13d4a23e92996e24d6a833ca75d06428c5387aa4 (patch) | |
| tree | 49d69b2c232ff94c627141fbaf9fdb6c57895f97 /runtime/wtp.c | |
| parent | fc3e56941ca6dbf401bee2f9dc0f9e4c5cd87f40 (diff) | |
| download | rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.tar.gz rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.tar.xz rsyslog-13d4a23e92996e24d6a833ca75d06428c5387aa4.zip | |
some more fixes for queue engine
The enhanced testbench now runs without failures, again
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 a5836da3..6b39793b 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -294,17 +294,13 @@ wtpShutdownAll(wtp_t *pThis, wtpState_t tShutdownCmd, struct timespec *ptTimeout ISOBJ_TYPE_assert(pThis, wtp); -dbgprintf("XXX:10 wtp %p, state %d\n", pThis, pThis->wtpState); wtpSetState(pThis, tShutdownCmd); -dbgprintf("XXX:20 wtp %p, state %d\n", pThis, pThis->wtpState); wtpWakeupAllWrkr(pThis); -dbgprintf("XXX:30 wtp %p, state %d\n", pThis, pThis->wtpState); /* see if we need to harvest (join) any terminated threads (even in timeout case, * some may have terminated... */ wtpProcessThrdChanges(pThis); -dbgprintf("XXX:40 wtp %p, state %d\n", pThis, pThis->wtpState); /* and wait for their termination */ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); @@ -312,9 +308,7 @@ dbgprintf("XXX:40 wtp %p, state %d\n", pThis, pThis->wtpState); pthread_cleanup_push(mutexCancelCleanup, &pThis->mut); pthread_setcancelstate(iCancelStateSave, NULL); bTimedOut = 0; -dbgprintf("XXX:50 wtp %p, state %d\n", pThis, pThis->wtpState); while(pThis->iCurNumWrkThrd > 0 && !bTimedOut) { -dbgprintf("XXX:60 wtp %p, state %d\n", pThis, pThis->wtpState); dbgprintf("%s: waiting %ldms on worker thread termination, %d still running\n", wtpGetDbgHdr(pThis), timeoutVal(ptTimeout), pThis->iCurNumWrkThrd); |