diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-27 14:46:23 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-27 14:46:23 +0000 |
| commit | 7d8b1c293746d325db7f93d343a952e382da9ddd (patch) | |
| tree | 11eb0c0bceb920fc7e89ecb1fe83bd89e46b9fd2 /wtp.c | |
| parent | ea7fd874d7b294dacc909a0f8e9c51dcc639d879 (diff) | |
| download | rsyslog-7d8b1c293746d325db7f93d343a952e382da9ddd.tar.gz rsyslog-7d8b1c293746d325db7f93d343a952e382da9ddd.tar.xz rsyslog-7d8b1c293746d325db7f93d343a952e382da9ddd.zip | |
fixed a bug when shutting down DA queue
Diffstat (limited to 'wtp.c')
| -rw-r--r-- | wtp.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -350,11 +350,11 @@ wtpCancelAll(wtp_t *pThis) /* process any pending thread requests so that we know who actually is still running */ wtpProcessThrdChanges(pThis); -RUNLOG_VAR("%d", pThis->iCurNumWrkThrd); +//RUNLOG_VAR("%d", pThis->iCurNumWrkThrd); /* go through all workers and cancel those that are active */ for(i = 0 ; i < pThis->iNumWorkerThreads ; ++i) { // TODO: mutex lock! -RUNLOG_VAR("%d", pThis->pWrkr[i]->tCurrCmd); +//RUNLOG_VAR("%d", pThis->pWrkr[i]->tCurrCmd); if(pThis->pWrkr[i]->tCurrCmd >= eWRKTHRD_TERMINATING) { dbgprintf("%s: canceling worker thread %d\n", wtpGetDbgHdr(pThis), i); pthread_cancel(pThis->pWrkr[i]->thrdID); @@ -483,8 +483,6 @@ wtpStartWrkr(wtp_t *pThis, int bLockMutex) BEGIN_MTX_PROTECTED_OPERATIONS(&pThis->mut, bLockMutex); pThis->iCurNumWrkThrd++; -dbgPrintAllDebugInfo(); -RUNLOG_VAR("%d", pThis->iCurNumWrkThrd); /* find free spot in thread table. If we find at least one worker that is in initialization, * we do NOT start a new one. Let's give the other one a chance, first. |