summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-20 08:15:19 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-20 08:15:19 +0200
commit88132c79f1e75edb2caf5d3f9ad1685834785be7 (patch)
treeb36a8e3e2bd34f624613d3e04a21907ce6806769
parentac186f1c3d6d4a8fa4230a205c7fce91b3fef535 (diff)
downloadrsyslog-88132c79f1e75edb2caf5d3f9ad1685834785be7.tar.gz
rsyslog-88132c79f1e75edb2caf5d3f9ad1685834785be7.tar.xz
rsyslog-88132c79f1e75edb2caf5d3f9ad1685834785be7.zip
cleanup: removed no longer needed code
-rw-r--r--runtime/wtp.c18
-rw-r--r--runtime/wtp.h2
2 files changed, 0 insertions, 20 deletions
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 74304d0f..46b5f4bb 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -298,24 +298,6 @@ wtpCancelAll(wtp_t *pThis)
}
-
-/* Set the Inactivity Guard
- * rgerhards, 2008-01-21
- */
-rsRetVal
-wtpSetInactivityGuard(wtp_t *pThis, int bNewState, int bLockMutex)
-{
- DEFiRet;
- DEFVARS_mutexProtection;
-
- BEGIN_MTX_PROTECTED_OPERATIONS(&pThis->mutWtp, bLockMutex);
- pThis->bInactivityGuard = bNewState;
- END_MTX_PROTECTED_OPERATIONS(&pThis->mutWtp);
-
- RETiRet;
-}
-
-
/* cancellation cleanup handler for executing worker
* decrements the worker counter
* rgerhards, 2008-01-20
diff --git a/runtime/wtp.h b/runtime/wtp.h
index 69a05a14..e2dd9409 100644
--- a/runtime/wtp.h
+++ b/runtime/wtp.h
@@ -48,7 +48,6 @@ struct wtp_s {
int iCurNumWrkThrd;/* current number of active worker threads */
struct wti_s **pWrkr;/* array with control structure for the worker thread(s) associated with this wtp */
int toWrkShutdown; /* timeout for idle workers in ms, -1 means indefinite (0 is immediate) */
- bool bInactivityGuard;/* prevents inactivity due to race condition */
rsRetVal (*pConsumer)(void *); /* user-supplied consumer function for dewtpd messages */
/* synchronization variables */
pthread_mutex_t mutWtp; /* mutex for the wtp's thread management */
@@ -81,7 +80,6 @@ rsRetVal wtpConstructFinalize(wtp_t *pThis);
rsRetVal wtpDestruct(wtp_t **ppThis);
rsRetVal wtpAdviseMaxWorkers(wtp_t *pThis, int nMaxWrkr);
rsRetVal wtpProcessThrdChanges(wtp_t *pThis);
-rsRetVal wtpSetInactivityGuard(wtp_t *pThis, int bNewState, int bLockMutex);
rsRetVal wtpChkStopWrkr(wtp_t *pThis, int bLockUsrMutex);
rsRetVal wtpSetState(wtp_t *pThis, wtpState_t iNewState);
rsRetVal wtpWakeupWrkr(wtp_t *pThis);