diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 13:04:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-02 13:04:09 +0200 |
| commit | 589f8af56cac4a4b55de757834b6e632a199e395 (patch) | |
| tree | 8886083e0f9e8059bbbc5184a7d1133c1cfdbd60 /runtime/wtp.c | |
| parent | 16b960939ee44155a9ac6ac6999b6ab71f237034 (diff) | |
| parent | 6ffb9010811ee9bc0c3703716443c4dd00922f6f (diff) | |
| download | rsyslog-589f8af56cac4a4b55de757834b6e632a199e395.tar.gz rsyslog-589f8af56cac4a4b55de757834b6e632a199e395.tar.bz2 rsyslog-589f8af56cac4a4b55de757834b6e632a199e395.zip | |
Merge branch 'dapatch' into v3-stable
Diffstat (limited to 'runtime/wtp.c')
| -rw-r--r-- | runtime/wtp.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c index 8b041ea2..fcefa1d8 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -76,6 +76,7 @@ static rsRetVal NotImplementedDummy() { return RS_RET_OK; } */ BEGINobjConstruct(wtp) /* be sure to specify the object type also in END macro! */ pthread_mutex_init(&pThis->mut, NULL); + pthread_mutex_init(&pThis->mutThrdShutdwn, NULL); pthread_cond_init(&pThis->condThrdTrm, NULL); /* set all function pointers to "not implemented" dummy so that we can safely call them */ pThis->pfChkStopWrkr = NotImplementedDummy; @@ -140,6 +141,7 @@ CODESTARTobjDestruct(wtp) /* actual destruction */ pthread_cond_destroy(&pThis->condThrdTrm); pthread_mutex_destroy(&pThis->mut); + pthread_mutex_destroy(&pThis->mutThrdShutdwn); if(pThis->pszDbgHdr != NULL) free(pThis->pszDbgHdr); @@ -189,11 +191,23 @@ wtpProcessThrdChanges(wtp_t *pThis) if(pThis->bThrdStateChanged == 0) FINALIZE; - /* go through all threads */ - for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { - wtiProcessThrdChanges(pThis->pWrkr[i], LOCK_MUTEX); + if(d_pthread_mutex_trylock(&(pThis->mutThrdShutdwn)) != 0) { + /* another thread is already in the loop */ + FINALIZE; } + do { + /* reset the change marker */ + pThis->bThrdStateChanged = 0; + /* go through all threads */ + for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { + wtiProcessThrdChanges(pThis->pWrkr[i], LOCK_MUTEX); + } + /* restart if another change occured while we were processing the changes */ + } while(pThis->bThrdStateChanged != 0); + + d_pthread_mutex_unlock(&(pThis->mutThrdShutdwn)); + finalize_it: RETiRet; } |