diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-07 12:57:36 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-07 12:57:36 +0100 |
| commit | fb81cf202c0277f48c75f777fa47e4db4e59f0a3 (patch) | |
| tree | 804c7265d82e0bb7127b31a9a7d68cc4b616e279 /runtime/wtp.h | |
| parent | ec32919ca05598f11f538060c406d8668a35e229 (diff) | |
| parent | 9035771b7dbea738b8a22949a7f0a6514525fafb (diff) | |
| download | rsyslog-fb81cf202c0277f48c75f777fa47e4db4e59f0a3.tar.gz rsyslog-fb81cf202c0277f48c75f777fa47e4db4e59f0a3.tar.bz2 rsyslog-fb81cf202c0277f48c75f777fa47e4db4e59f0a3.zip | |
Merge branch 'master' into master-ruleeng
Conflicts:
runtime/wti.c
runtime/wti.h
Diffstat (limited to 'runtime/wtp.h')
| -rw-r--r-- | runtime/wtp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/wtp.h b/runtime/wtp.h index 25992f7f..4bc284cb 100644 --- a/runtime/wtp.h +++ b/runtime/wtp.h @@ -56,7 +56,6 @@ struct wtp_s { void *pUsr; /* pointer to user object (in this case, the queue the wtp belongs to) */ pthread_attr_t attrThrd;/* attribute for new threads (created just once and cached here) */ pthread_mutex_t *pmutUsr; - pthread_cond_t *pcondBusy; /* condition the user will signal "busy again, keep runing" on (awakes worker) */ rsRetVal (*pfChkStopWrkr)(void *pUsr, int); rsRetVal (*pfGetDeqBatchSize)(void *pUsr, int*); /* obtains max dequeue count from queue config */ rsRetVal (*pfObjProcessed)(void *pUsr, wti_t *pWti); /* indicate user object is processed */ @@ -95,6 +94,5 @@ PROTOTYPEpropSetMeth(wtp, iMaxWorkerThreads, int); PROTOTYPEpropSetMeth(wtp, pUsr, void*); PROTOTYPEpropSetMeth(wtp, iNumWorkerThreads, int); PROTOTYPEpropSetMethPTR(wtp, pmutUsr, pthread_mutex_t); -PROTOTYPEpropSetMethPTR(wtp, pcondBusy, pthread_cond_t); #endif /* #ifndef WTP_H_INCLUDED */ |