From a1b752b32ffb90bfdce4fd8dfdffac3ebbadc79e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 16 Dec 2011 15:12:24 +0100
Subject: more work on queue statistics counter

---
 ChangeLog         |  4 ++--
 doc/impstats.html |  4 +++-
 runtime/queue.c   | 12 ++++++++----
 runtime/queue.h   |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f228b80..b2c8bf44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 Version 5.9.5  [V5-DEVEL], 2011-11-29
-- new stats counter "discarded" for queue object. Tells how many messages
-  have been discarded due to queue full condition.
+- new stats counters "discarded.nf" and "discarded.full" for queue object.
+  Tells how many messages have been discarded due to queue full condition.
 ---------------------------------------------------------------------------
 Version 5.9.5  [V5-DEVEL], 2011-11-29
 - enhanced module loader to not rely on PATH_MAX
diff --git a/doc/impstats.html b/doc/impstats.html
index cede4874..260c1aa4 100644
--- a/doc/impstats.html
+++ b/doc/impstats.html
@@ -18,7 +18,9 @@ prepared to change your trending scripts when you upgrade to a newer rsyslog ver
 output is periodic, with the interval being configurable (default is 5 minutes).
 Be sure that your configuration records the counter messages (default is syslog.info).
 <p>Note that loading this module has impact on rsyslog performance. Depending on
-settings, this impact may be severe (for high-load environments).
+settings, this impact may be noticable (for high-load environments).
+<p>The rsyslog website has an updated overview of available
+<a href="http://rsyslog.com/rsyslog-statistic-counter/">rsyslog statistic counters</a>.
 </p>
 <p><b>Configuration Directives</b>:</p>
 <ul>
diff --git a/runtime/queue.c b/runtime/queue.c
index 1692db3a..c8e6bb27 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1355,6 +1355,7 @@ static int qqueueChkDiscardMsg(qqueue_t *pThis, int iQueueSize, void *pUsr)
 		if(iRetLocal == RS_RET_OK && iSeverity >= pThis->iDiscardSeverity) {
 			DBGOPRINT((obj_t*) pThis, "queue nearly full (%d entries), discarded severity %d message\n",
 				  iQueueSize, iSeverity);
+			STATSCOUNTER_INC(pThis->ctrNFDscrd, pThis->mutCtrNFDscrd);
 			objDestruct(pUsr);
 			ABORT_FINALIZE(RS_RET_QUEUE_FULL);
 		} else {
@@ -1989,9 +1990,12 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */
 	CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("full"),
 		ctrType_IntCtr, &pThis->ctrFull));
 
-	STATSCOUNTER_INIT(pThis->ctrDscrd, pThis->mutCtrDscrd);
-	CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("discarded"),
-		ctrType_IntCtr, &pThis->ctrDscrd));
+	STATSCOUNTER_INIT(pThis->ctrFDscrd, pThis->mutCtrFDscrd);
+	CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("discarded.full"),
+		ctrType_IntCtr, &pThis->ctrFDscrd));
+	STATSCOUNTER_INIT(pThis->ctrNFDscrd, pThis->mutCtrNFDscrd);
+	CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("discarded.nf"),
+		ctrType_IntCtr, &pThis->ctrNFDscrd));
 
 	pThis->ctrMaxqsize = 0;
 	CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("maxqsize"),
@@ -2346,7 +2350,7 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr)
 // TODO : handle enqOnly => discard!
 		if(pthread_cond_timedwait(&pThis->notFull, pThis->mut, &t) != 0) {
 			DBGOPRINT((obj_t*) pThis, "enqueueMsg: cond timeout, dropping message!\n");
-			STATSCOUNTER_INC(pThis->ctrDscrd, pThis->mutCtrDscrd);
+			STATSCOUNTER_INC(pThis->ctrFDscrd, pThis->mutCtrFDscrd);
 			objDestruct(pUsr);
 			ABORT_FINALIZE(RS_RET_QUEUE_FULL);
 		}
diff --git a/runtime/queue.h b/runtime/queue.h
index 70bb8895..06a58229 100644
--- a/runtime/queue.h
+++ b/runtime/queue.h
@@ -169,7 +169,8 @@ struct queue_s {
 	statsobj_t *statsobj;
 	STATSCOUNTER_DEF(ctrEnqueued, mutCtrEnqueued);
 	STATSCOUNTER_DEF(ctrFull, mutCtrFull);
-	STATSCOUNTER_DEF(ctrDscrd, mutCtrDscrd);
+	STATSCOUNTER_DEF(ctrFDscrd, mutCtrFDscrd);
+	STATSCOUNTER_DEF(ctrNFDscrd, mutCtrNFDscrd);
 	int ctrMaxqsize;
 };
 
-- 
cgit