diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 17:50:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-17 17:50:45 +0100 |
| commit | cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15 (patch) | |
| tree | 266589cc5a59d31f3b18a05b79bcb3d9bec22a55 /runtime/queue.c | |
| parent | f6434d87c4c38edb80a718a5e0929ac369e8bfba (diff) | |
| parent | d94ba2a5468089b657e0779ddd2f4585face37e3 (diff) | |
| download | rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.tar.gz rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.tar.bz2 rsyslog-cb4bc708b1a0b15e6c22fd457b6dfa456e4d3d15.zip | |
Merge branch 'v6-stable'
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 5286f23d..5acf5f02 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2062,10 +2062,9 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ 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; + /* iQueueSize is a dual-use counter: no init, no mutex! */ 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"), @@ -2082,7 +2081,7 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("discarded.nf"), ctrType_IntCtr, &pThis->ctrNFDscrd)); - pThis->ctrMaxqsize = 0; + pThis->ctrMaxqsize = 0; /* no mutex needed, thus no init call */ CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("maxqsize"), ctrType_Int, &pThis->ctrMaxqsize)); |