diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 12:53:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 12:53:00 +0200 |
| commit | d116f30a877c65b4f23dbb92601251402b0f957e (patch) | |
| tree | 4670311037ee3862e64260044eaf4599a1ed4856 /runtime/wti.c | |
| parent | e56a30372e807019618570ed70874a3389da2ac2 (diff) | |
| download | rsyslog-d116f30a877c65b4f23dbb92601251402b0f957e.tar.gz rsyslog-d116f30a877c65b4f23dbb92601251402b0f957e.tar.xz rsyslog-d116f30a877c65b4f23dbb92601251402b0f957e.zip | |
improvements/fixes in queue termination timeout handling
- bugfix: subtle (and usually irrelevant) issue in timout processing
timeout could be one second too early if nanoseconds wrapped
- set a more sensible timeout for shutdow, now 1.5 seconds to complete
processing (this also removes those cases where the shutdown message
was not written because the termination happened before it)
Diffstat (limited to 'runtime/wti.c')
| -rw-r--r-- | runtime/wti.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/wti.c b/runtime/wti.c index 9c137f57..917b456b 100644 --- a/runtime/wti.c +++ b/runtime/wti.c @@ -147,10 +147,12 @@ wtiSetState(wti_t *pThis, qWrkCmd_t tCmd, int bActiveOnly, int bLockMutex) break; } /* apply the new state */ +dbgprintf("worker terminator will write stateval %d\n", tCmd); unsigned val = ATOMIC_CAS_VAL(pThis->tCurrCmd, tCurrCmd, tCmd); if(val != tCurrCmd) { DBGPRINTF("wtiSetState PROBLEM, tCurrCmd %d overwritten with %d, wanted to set %d\n", tCurrCmd, val, tCmd); } +//dbgprintf("worker terminator has written stateval %d\n", tCmd); } END_MTX_PROTECTED_OPERATIONS(&pThis->mut); @@ -158,7 +160,7 @@ wtiSetState(wti_t *pThis, qWrkCmd_t tCmd, int bActiveOnly, int bLockMutex) } -/* Cancel the thread. If the thread is already cancelled or termination, +/* Cancel the thread. If the thread is already cancelled or terminated, * we do not again cancel it. But it is save and legal to call wtiCancelThrd() in * such situations. * rgerhards, 2008-02-26 @@ -172,8 +174,10 @@ wtiCancelThrd(wti_t *pThis) d_pthread_mutex_lock(&pThis->mut); + wtiProcessThrdChanges(pThis, MUTEX_ALREADY_LOCKED); /* process state change, so that we have current state vars */ + if(pThis->tCurrCmd >= eWRKTHRD_TERMINATING) { - dbgoprint((obj_t*) pThis, "canceling worker thread\n"); + dbgoprint((obj_t*) pThis, "canceling worker thread, curr stat %d\n", pThis->tCurrCmd); pthread_cancel(pThis->thrdID); wtiSetState(pThis, eWRKTHRD_TERMINATING, 0, MUTEX_ALREADY_LOCKED); ATOMIC_STORE_1_TO_INT(pThis->pWtp->bThrdStateChanged); /* indicate change, so harverster will be called */ |