Merge branch 'v5-stable' into v5-stable-newstats
authorRainer Gerhards <rgerhards@adiscon.com>
Wed, 14 Mar 2012 12:44:35 +0000 (13:44 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Wed, 14 Mar 2012 12:44:35 +0000 (13:44 +0100)
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h

1  2 
ChangeLog
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h

diff --cc ChangeLog
Simple merge
Simple merge
diff --cc runtime/queue.c
@@@ -1944,14 -1942,7 +1943,14 @@@ qqueueStart(qqueue_t *pThis) /* this i
        CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("full"),
                ctrType_IntCtr, &pThis->ctrFull));
  
-       pThis->ctrMaxqsize = 0;
 +      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; /* no mutex needed, thus no init call */
        CHKiRet(statsobj.AddCounter(pThis->statsobj, UCHAR_CONSTANT("maxqsize"),
                ctrType_Int, &pThis->ctrMaxqsize));
  
diff --cc runtime/queue.h
@@@ -169,9 -169,7 +169,9 @@@ struct queue_s 
        statsobj_t *statsobj;
        STATSCOUNTER_DEF(ctrEnqueued, mutCtrEnqueued);
        STATSCOUNTER_DEF(ctrFull, mutCtrFull);
-       int ctrMaxqsize;
 +      STATSCOUNTER_DEF(ctrFDscrd, mutCtrFDscrd);
 +      STATSCOUNTER_DEF(ctrNFDscrd, mutCtrNFDscrd);
+       int ctrMaxqsize; /* NOT guarded by a mutex */
  };