Counters: more unused code removal

diff --git a/src/counters.c b/src/counters.c
index 9b6772559f47ae7da855be86a88dfa77feea2c28..59c952e6cfe41effed3794c665eef0c1530e06ff 100644 (file)
--- a/src/counters.c
+++ b/src/counters.c
@@ -601,10 +601,8 @@ static uint16_t SCPerfRegisterQualifiedCounter(char *cname, char *tm_name,
  *
  * \param pcae     Pointer to the SCPerfCounterArray which holds the local
  *                 versions of the counters
- * \param reset_lc Flag which indicates if the values of the local counters
- *                 in the SCPerfCounterArray has to be reset or not
  */
-static void SCPerfCopyCounterValue(SCPCAElem *pcae, int reset_lc)
+static void SCPerfCopyCounterValue(SCPCAElem *pcae)
 {
     SCPerfCounter *pc = NULL;
     uint64_t ui64_temp = 0;
@@ -620,9 +618,6 @@ static void SCPerfCopyCounterValue(SCPCAElem *pcae, int reset_lc)
         *((uint64_t *)pc->value->cvalue) = ui64_temp;
     }
 
-    if (reset_lc)
-        pcae->ui64_cnt = 0;
-
     return;
 }
 
@@ -1246,8 +1241,7 @@ SCPerfCounterArray *SCPerfGetAllCountersArray(SCPerfContext *pctx)
  * \retval  0 on success
  * \retval -1 on error
  */
-int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx,
-                             int reset_lc)
+int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx)
 {
     SCPerfCounter  *pc = NULL;
     SCPCAElem *pcae = NULL;
@@ -1270,7 +1264,7 @@ int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx,
                 continue;
             }
 
-            SCPerfCopyCounterValue(&pcae[i], reset_lc);
+            SCPerfCopyCounterValue(&pcae[i]);
 
             pc->updated++;
 
@@ -1579,7 +1573,7 @@ static int SCPerfTestUpdateGlobalCounter10()
     SCPerfCounterIncr(id3, pca);
     SCPerfCounterAddUI64(id3, pca, 100);
 
-    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx, 0);
+    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx);
 
     result = (1 == *((uint64_t *)tv.sc_perf_pctx.head->value->cvalue) );
     result &= (100 == *((uint64_t *)tv.sc_perf_pctx.head->next->value->cvalue) );
@@ -1617,7 +1611,7 @@ static int SCPerfTestCounterValues11()
     SCPerfCounterAddUI64(id3, pca, 257);
     SCPerfCounterAddUI64(id4, pca, 16843024);
 
-    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx, 0);
+    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx);
 
     uint64_t *u64p = (uint64_t *)tv.sc_perf_pctx.head->value->cvalue;
     result &= (1 == *u64p);

diff --git a/src/counters.h b/src/counters.h
index 8a72cacac23b8ba944b9f948541bca81b0d090e2..f11b0dca36034eb57a6c4ae9573b6a2c5cc234e7 100644 (file)
--- a/src/counters.h
+++ b/src/counters.h
@@ -195,7 +195,7 @@ int SCPerfAddToClubbedTMTable(char *, SCPerfContext *);
 SCPerfCounterArray *SCPerfGetCounterArrayRange(uint16_t, uint16_t, SCPerfContext *);
 SCPerfCounterArray * SCPerfGetAllCountersArray(SCPerfContext *);
 
-int SCPerfUpdateCounterArray(SCPerfCounterArray *, SCPerfContext *, int);
+int SCPerfUpdateCounterArray(SCPerfCounterArray *, SCPerfContext *);
 double SCPerfGetLocalCounterValue(uint16_t, SCPerfCounterArray *);
 
 void SCPerfOutputCounters(void);
@@ -213,14 +213,14 @@ void SCPerfRegisterTests(void);
 /* functions used to update local counter values */
 void SCPerfCounterAddUI64(uint16_t, SCPerfCounterArray *, uint64_t);
 
-#define SCPerfSyncCounters(tv, reset_lc) \
-    SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx, (reset_lc)); \
+#define SCPerfSyncCounters(tv) \
+    SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx);           \
 
-#define SCPerfSyncCountersIfSignalled(tv, reset_lc)                        \
-    do {                                                        \
-        if ((tv)->sc_perf_pctx.perf_flag == 1) {                            \
-            SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx, (reset_lc)); \
-        }                                                               \
+#define SCPerfSyncCountersIfSignalled(tv)                                       \
+    do {                                                                        \
+        if ((tv)->sc_perf_pctx.perf_flag == 1) {                                \
+            SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx);   \
+        }                                                                       \
     } while (0)
 
 #ifdef BUILD_UNIX_SOCKET
@@ -230,3 +230,4 @@ TmEcode SCPerfOutputCounterSocket(json_t *cmd,
 #endif
 
 #endif /* __COUNTERS_H__ */
+

diff --git a/src/flow-manager.c b/src/flow-manager.c
index 3b31653d61abc81194063b4beaff1a443b9d0699..86869d7346af79f1390c12aae8d925f3efe1d777 100644 (file)
--- a/src/flow-manager.c
+++ b/src/flow-manager.c
@@ -532,7 +532,7 @@ void *FlowManagerThread(void *td)
         }
 
         if (TmThreadsCheckFlag(th_v, THV_KILL)) {
-            SCPerfSyncCounters(th_v, 0);
+            SCPerfSyncCounters(th_v);
             break;
         }
 
@@ -545,7 +545,7 @@ void *FlowManagerThread(void *td)
 
         SCLogDebug("woke up... %s", SC_ATOMIC_GET(flow_flags) & FLOW_EMERGENCY ? "emergency":"");
 
-        SCPerfSyncCountersIfSignalled(th_v, 0);
+        SCPerfSyncCountersIfSignalled(th_v);
     }
 
     TmThreadsSetFlag(th_v, THV_RUNNING_DONE);

diff --git a/src/source-af-packet.c b/src/source-af-packet.c
index 38e7b697adc28ce248e4805f7f56caad37e5483c..d6b9306ba6e55cec6c6b1b8d10c06525775563f7 100644 (file)
--- a/src/source-af-packet.c
+++ b/src/source-af-packet.c
@@ -1082,7 +1082,7 @@ TmEcode ReceiveAFPLoop(ThreadVars *tv, void *data, void *slot)
             AFPSwitchState(ptv, AFP_STATE_DOWN);
             continue;
         }
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     SCReturnInt(TM_ECODE_OK);

diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c
index e1479cf4f1e44344a8d088a203cdc16e295fd882..97e2d4c6d5672e17252e9b8a19067591e50560d1 100644 (file)
--- a/src/source-erf-dag.c
+++ b/src/source-erf-dag.c
@@ -358,7 +358,7 @@ TmEcode ReceiveErfDagLoop(ThreadVars *tv, void *data, void *slot)
             SCReturnInt(TM_ECODE_FAILED);
         }
 
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
 
         SCLogDebug("Read %d records from stream: %d, DAG: %s",
                    pkts_read, dtv->dagstream, dtv->dagname);

diff --git a/src/source-ipfw.c b/src/source-ipfw.c
index 853ac47512bb0e718ff9f2dda6410bada497be1e..4df4c4ed43de1f58ba91df8033fdefaf7e984f8a 100644 (file)
--- a/src/source-ipfw.c
+++ b/src/source-ipfw.c
@@ -305,7 +305,7 @@ TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot)
             SCReturnInt(TM_ECODE_FAILED);
         }
 
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     SCReturnInt(TM_ECODE_OK);

diff --git a/src/source-mpipe.c b/src/source-mpipe.c
index 0a6ca893cbc848aecb6658eef4454522829c5384..01547391a7d66f9b6c330a74436981aa6ed15f87 100644 (file)
--- a/src/source-mpipe.c
+++ b/src/source-mpipe.c
@@ -388,7 +388,7 @@ TmEcode ReceiveMpipeLoop(ThreadVars *tv, void *data, void *slot)
             /* Move forward M packets in ingress ring. */
             gxio_mpipe_iqueue_advance(iqueue, m);
         }
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
     SCReturnInt(TM_ECODE_OK);
 }

diff --git a/src/source-napatech.c b/src/source-napatech.c
index 711533c9c2c521d014f0919ee642a89a956a9b2e..593a4d5f32f0dcb2974a2647f96257252290255a 100644 (file)
--- a/src/source-napatech.c
+++ b/src/source-napatech.c
@@ -298,7 +298,7 @@ TmEcode NapatechStreamLoop(ThreadVars *tv, void *data, void *slot)
         }
 
         NT_NetRxRelease(ntv->rx_stream, packet_buffer);
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     SCReturnInt(TM_ECODE_OK);

diff --git a/src/source-nfq.c b/src/source-nfq.c
index f4476bb791c841415dc9c1db7840cd03f60ea248..44fd8d9f63e4be86fc568582d07e2f38ea106acc 100644 (file)
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -988,7 +988,7 @@ TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot)
         }
         NFQRecvPkt(nq, ntv);
 
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
     SCReturnInt(TM_ECODE_OK);
 }

diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index 3b0e9cb5a15c33707b8eddc74a246ec8c08ddedc..834624ac868b09336ae9d2dba92bac737349acb5 100644 (file)
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -227,7 +227,7 @@ TmEcode ReceivePcapFileLoop(ThreadVars *tv, void *data, void *slot)
                 SCReturnInt(TM_ECODE_DONE);
             }
         }
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     SCReturnInt(TM_ECODE_OK);

diff --git a/src/source-pcap.c b/src/source-pcap.c
index e207ee1e7bea8b184ecd240f503b4adc1e774eac..582a21099e568b16c61b00d27a977032b10a0c98 100644 (file)
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -342,7 +342,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
             SCReturnInt(TM_ECODE_FAILED);
         }
 
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     SCReturnInt(TM_ECODE_OK);

diff --git a/src/source-pfring.c b/src/source-pfring.c
index c138ae888a0cf9ccca4f2fed97a3c3aec9a06f5a..4dd40000a5085fd48cf352e54c53fdac3f506289 100644 (file)
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -336,7 +336,7 @@ TmEcode ReceivePfringLoop(ThreadVars *tv, void *data, void *slot)
             TmqhOutputPacketpool(ptv->tv, p);
             SCReturnInt(TM_ECODE_FAILED);
         }
-        SCPerfSyncCountersIfSignalled(tv, 0);
+        SCPerfSyncCountersIfSignalled(tv);
     }
 
     return TM_ECODE_OK;

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 0e3a7f17798d25e2fc810a24c336c4cc35252192..a712b53d276629b6089367d218e8af3645665b58 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -204,7 +204,7 @@ void *TmThreadsSlot1NoIn(void *td)
         }
 
         if (TmThreadsCheckFlag(tv, THV_KILL)) {
-            SCPerfSyncCounters(tv, 0);
+            SCPerfSyncCounters(tv);
             run = 0;
         }
     } /* while (run) */
@@ -296,7 +296,7 @@ void *TmThreadsSlot1NoOut(void *td)
         }
 
         if (TmThreadsCheckFlag(tv, THV_KILL)) {
-            SCPerfSyncCounters(tv, 0);
+            SCPerfSyncCounters(tv);
             run = 0;
         }
     } /* while (run) */
@@ -383,7 +383,7 @@ void *TmThreadsSlot1NoInOut(void *td)
         }
 
         if (TmThreadsCheckFlag(tv, THV_KILL)) {
-            SCPerfSyncCounters(tv, 0);
+            SCPerfSyncCounters(tv);
             run = 0;
         }
     } /* while (run) */
@@ -510,7 +510,7 @@ void *TmThreadsSlot1(void *td)
         }
 
         if (TmThreadsCheckFlag(tv, THV_KILL)) {
-            SCPerfSyncCounters(tv, 0);
+            SCPerfSyncCounters(tv);
             run = 0;
         }
     } /* while (run) */
@@ -710,7 +710,7 @@ void *TmThreadsSlotPktAcqLoop(void *td) {
             run = 0;
         }
     }
-    SCPerfSyncCounters(tv, 0);
+    SCPerfSyncCounters(tv);
 
     TmThreadsSetFlag(tv, THV_RUNNING_DONE);
     TmThreadWaitForFlag(tv, THV_DEINIT);
@@ -857,7 +857,7 @@ void *TmThreadsSlotVar(void *td)
             run = 0;
         }
     } /* while (run) */
-    SCPerfSyncCounters(tv, 0);
+    SCPerfSyncCounters(tv);
 
     TmThreadsSetFlag(tv, THV_RUNNING_DONE);
     TmThreadWaitForFlag(tv, THV_DEINIT);

diff --git a/src/tmqh-flow.c b/src/tmqh-flow.c
index 4fdb4d06cede120e5a6070854699eee196707e8d..f76a4a3cc8ae1f12d8bcf33f0f15a46e9b93510c 100644 (file)
--- a/src/tmqh-flow.c
+++ b/src/tmqh-flow.c
@@ -85,7 +85,7 @@ Packet *TmqhInputFlow(ThreadVars *tv)
 {
     PacketQueue *q = &trans_q[tv->inq->id];
 
-    SCPerfSyncCountersIfSignalled(tv, 0);
+    SCPerfSyncCountersIfSignalled(tv);
 
     SCMutexLock(&q->mutex_q);
     if (q->len == 0) {

diff --git a/src/tmqh-ringbuffer.c b/src/tmqh-ringbuffer.c
index 5108935c4b368d942162c67bfdd6b569f9060e3f..8c5c95caadd6cf7ee61d559b1c0f8b5d73e518f6 100644 (file)
--- a/src/tmqh-ringbuffer.c
+++ b/src/tmqh-ringbuffer.c
@@ -101,7 +101,7 @@ Packet *TmqhInputRingBufferMrSw(ThreadVars *t)
 
     Packet *p = (Packet *)RingBufferMrSw8Get(rb);
 
-    SCPerfSyncCountersIfSignalled(t, 0);
+    SCPerfSyncCountersIfSignalled(t);
 
     return p;
 }
@@ -118,7 +118,7 @@ Packet *TmqhInputRingBufferSrSw(ThreadVars *t)
 
     Packet *p = (Packet *)RingBufferSrSw8Get(rb);
 
-    SCPerfSyncCountersIfSignalled(t, 0);
+    SCPerfSyncCountersIfSignalled(t);
 
     return p;
 }
@@ -135,7 +135,7 @@ Packet *TmqhInputRingBufferSrMw(ThreadVars *t)
 
     Packet *p = (Packet *)RingBufferSrMw8Get(rb);
 
-    SCPerfSyncCountersIfSignalled(t, 0);
+    SCPerfSyncCountersIfSignalled(t);
 
     return p;
 }

diff --git a/src/tmqh-simple.c b/src/tmqh-simple.c
index fe1902be003b1163ccd800bbe9b85538ebdc4e42..b7dfd44969523cb6726585b3fe31aaf243fd0414 100644 (file)
--- a/src/tmqh-simple.c
+++ b/src/tmqh-simple.c
@@ -46,7 +46,7 @@ Packet *TmqhInputSimple(ThreadVars *t)
 {
     PacketQueue *q = &trans_q[t->inq->id];
 
-    SCPerfSyncCountersIfSignalled(t, 0);
+    SCPerfSyncCountersIfSignalled(t);
 
     SCMutexLock(&q->mutex_q);