diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
| commit | f90675f33f33b8a83046f8a8462dd8dbe7648a4a (patch) | |
| tree | f695e6371b52141de4c4ce2295b317a1e487e7b3 /runtime/queue.c | |
| parent | 14d415e4a84e2c08df1b23a86959f0d9b0006687 (diff) | |
| parent | 74e09afd6db56f6e23c965f0949cfb9979928f13 (diff) | |
| download | rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.gz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.xz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
configure.ac
doc/imuxsock.html
doc/manual.html
runtime/queue.c
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 56d05571..fa2ed615 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1842,6 +1842,8 @@ qqueueChkStopWrkrDA(qqueue_t *pThis) { DEFiRet; + /*DBGPRINTF("XXXX: chkStopWrkrDA called, low watermark %d, log Size %d, phys Size %d, bEnqOnly %d\n", + pThis->iLowWtrMrk, getLogicalQueueSize(pThis), getPhysicalQueueSize(pThis), pThis->bEnqOnly);*/ if(pThis->bEnqOnly) { iRet = RS_RET_TERMINATE_WHEN_IDLE; } @@ -1862,6 +1864,8 @@ static rsRetVal ChkStopWrkrReg(qqueue_t *pThis) { DEFiRet; + /*DBGPRINTF("XXXX: chkStopWrkrReg called, low watermark %d, log Size %d, phys Size %d, bEnqOnly %d\n", + pThis->iLowWtrMrk, getLogicalQueueSize(pThis), getPhysicalQueueSize(pThis), pThis->bEnqOnly);*/ if(pThis->bEnqOnly) { iRet = RS_RET_TERMINATE_NOW; } else if(pThis->pqParent != NULL) { @@ -1898,6 +1902,7 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ int wrk; uchar *qName; size_t lenBuf; + int iQueueSizeSave; ASSERT(pThis != NULL); @@ -1979,8 +1984,11 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ qName = obj.GetName((obj_t*)pThis); CHKiRet(statsobj.Construct(&pThis->statsobj)); CHKiRet(statsobj.SetName(pThis->statsobj, qName)); + /* we need to save the queue size, as the stats module initializes it to 0! */ + iQueueSizeSave = pThis->iQueueSize; CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("size"), ctrType_Int, &pThis->iQueueSize)); + pThis->iQueueSize = iQueueSizeSave; STATSCOUNTER_INIT(pThis->ctrEnqueued, pThis->mutCtrEnqueued); CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("enqueued"), @@ -2491,6 +2499,7 @@ DEFpropSetMeth(qqueue, iLowWtrMrk, int) DEFpropSetMeth(qqueue, iDiscardMrk, int) DEFpropSetMeth(qqueue, iFullDlyMrk, int) DEFpropSetMeth(qqueue, iDiscardSeverity, int) +DEFpropSetMeth(qqueue, iLightDlyMrk, int) DEFpropSetMeth(qqueue, bIsDA, int) DEFpropSetMeth(qqueue, iMinMsgsPerWrkr, int) DEFpropSetMeth(qqueue, bSaveOnShutdown, int) |