diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-18 17:53:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-18 17:53:12 +0200 |
| commit | 7574e70df4c6796878d3b753275f01b5f0d65ade (patch) | |
| tree | d79350f92fa93c08258836213d3f01f475946b32 /runtime/wtp.c | |
| parent | af8582e50914cfc719be1a1a80eeb81030d611c5 (diff) | |
| download | rsyslog-7574e70df4c6796878d3b753275f01b5f0d65ade.tar.gz rsyslog-7574e70df4c6796878d3b753275f01b5f0d65ade.tar.xz rsyslog-7574e70df4c6796878d3b753275f01b5f0d65ade.zip | |
fixed race conditions during queue shutdown (DA case, disks active)
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index 65155efc..ece80911 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -228,6 +228,10 @@ wtpShutdownAll(wtp_t *pThis, wtpState_t tShutdownCmd, struct timespec *ptTimeout d_pthread_mutex_lock(pThis->pmutUsr); wtpSetState(pThis, tShutdownCmd); pthread_cond_broadcast(pThis->pcondBusy); /* wake up all workers */ + /* awake workers in retry loop */ + for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { + wtiWakeupThrd(pThis->pWrkr[i]); + } d_pthread_mutex_unlock(pThis->pmutUsr); /* wait for worker thread termination */ @@ -235,11 +239,6 @@ wtpShutdownAll(wtp_t *pThis, wtpState_t tShutdownCmd, struct timespec *ptTimeout pthread_cleanup_push(mutexCancelCleanup, &pThis->mutWtp); bTimedOut = 0; while(pThis->iCurNumWrkThrd > 0 && !bTimedOut) { - -for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { - wtiWakeupThrd(pThis->pWrkr[i]); -} - DBGPRINTF("%s: waiting %ldms on worker thread termination, %d still running\n", wtpGetDbgHdr(pThis), timeoutVal(ptTimeout), ATOMIC_FETCH_32BIT(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd)); @@ -248,6 +247,12 @@ for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { DBGPRINTF("%s: timeout waiting on worker thread termination\n", wtpGetDbgHdr(pThis)); bTimedOut = 1; /* we exit the loop on timeout */ } + + /* awake workers in retry loop */ + for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { + wtiWakeupThrd(pThis->pWrkr[i]); + } + } pthread_cleanup_pop(1); @@ -298,7 +303,7 @@ wtpWrkrExecCleanup(wti_t *pWti) wtiSetState(pWti, WRKTHRD_STOPPED); ATOMIC_DEC(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd); - DBGPRINTF("%s: Worker thread %lx, terminated, num workers now %d\n", + DBGPRINTF("%s: Worker thread %lx, terminated, um workers now %d\n", wtpGetDbgHdr(pThis), (unsigned long) pWti, ATOMIC_FETCH_32BIT(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd)); |