aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Counters: more unused code removal

Browse Source
pull/607/head
Victor Julien 12 years ago
parent 8d4a61a789
commit 677cd03e52
16 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File

16
src/counters.c
Unescape Escape View File

@ -601,10 +601,8 @@ static uint16_t SCPerfRegisterQualifiedCounter(char *cname, char *tm_name,
* *
* \param pcae Pointer to the SCPerfCounterArray which holds the local * \param pcae Pointer to the SCPerfCounterArray which holds the local
* versions of the counters * 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; SCPerfCounter *pc = NULL;
uint64_t ui64_temp = 0; uint64_t ui64_temp = 0;
@ -620,9 +618,6 @@ static void SCPerfCopyCounterValue(SCPCAElem *pcae, int reset_lc)
*((uint64_t *)pc->value->cvalue) = ui64_temp; *((uint64_t *)pc->value->cvalue) = ui64_temp;
} }
if (reset_lc)
pcae->ui64_cnt = 0;
return; return;
} }
@ -1246,8 +1241,7 @@ SCPerfCounterArray *SCPerfGetAllCountersArray(SCPerfContext *pctx)
* \retval 0 on success * \retval 0 on success
* \retval -1 on error * \retval -1 on error
*/ */
int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx, int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx)
int reset_lc)
{ {
SCPerfCounter *pc = NULL; SCPerfCounter *pc = NULL;
SCPCAElem *pcae = NULL; SCPCAElem *pcae = NULL;
@ -1270,7 +1264,7 @@ int SCPerfUpdateCounterArray(SCPerfCounterArray *pca, SCPerfContext *pctx,
continue; continue;
} }
SCPerfCopyCounterValue(&pcae[i], reset_lc); SCPerfCopyCounterValue(&pcae[i]);
pc->updated++; pc->updated++;
@ -1579,7 +1573,7 @@ static int SCPerfTestUpdateGlobalCounter10()
SCPerfCounterIncr(id3, pca); SCPerfCounterIncr(id3, pca);
SCPerfCounterAddUI64(id3, pca, 100); 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 = (1 == *((uint64_t *)tv.sc_perf_pctx.head->value->cvalue) );
result &= (100 == *((uint64_t *)tv.sc_perf_pctx.head->next->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(id3, pca, 257);
SCPerfCounterAddUI64(id4, pca, 16843024); 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; uint64_t *u64p = (uint64_t *)tv.sc_perf_pctx.head->value->cvalue;
result &= (1 == *u64p); result &= (1 == *u64p);

17
src/counters.h
Unescape Escape View File

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

4
src/flow-manager.c
Unescape Escape View File

@ -532,7 +532,7 @@ void *FlowManagerThread(void *td)
} }
if (TmThreadsCheckFlag(th_v, THV_KILL)) { if (TmThreadsCheckFlag(th_v, THV_KILL)) {
SCPerfSyncCounters(th_v, 0); SCPerfSyncCounters(th_v);
break; break;
} }
@ -545,7 +545,7 @@ void *FlowManagerThread(void *td)
SCLogDebug("woke up... %s", SC_ATOMIC_GET(flow_flags) & FLOW_EMERGENCY ? "emergency":""); 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); TmThreadsSetFlag(th_v, THV_RUNNING_DONE);

2
src/source-af-packet.c
Unescape Escape View File

@ -1082,7 +1082,7 @@ TmEcode ReceiveAFPLoop(ThreadVars *tv, void *data, void *slot)
AFPSwitchState(ptv, AFP_STATE_DOWN); AFPSwitchState(ptv, AFP_STATE_DOWN);
continue; continue;
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

2
src/source-erf-dag.c
Unescape Escape View File

@ -358,7 +358,7 @@ TmEcode ReceiveErfDagLoop(ThreadVars *tv, void *data, void *slot)
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
SCLogDebug("Read %d records from stream: %d, DAG: %s", SCLogDebug("Read %d records from stream: %d, DAG: %s",
pkts_read, dtv->dagstream, dtv->dagname); pkts_read, dtv->dagstream, dtv->dagname);

2
src/source-ipfw.c
Unescape Escape View File

@ -305,7 +305,7 @@ TmEcode ReceiveIPFWLoop(ThreadVars *tv, void *data, void *slot)
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

2
src/source-mpipe.c
Unescape Escape View File

@ -388,7 +388,7 @@ TmEcode ReceiveMpipeLoop(ThreadVars *tv, void *data, void *slot)
/* Move forward M packets in ingress ring. */ /* Move forward M packets in ingress ring. */
gxio_mpipe_iqueue_advance(iqueue, m); gxio_mpipe_iqueue_advance(iqueue, m);
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-napatech.c
Unescape Escape View File

@ -298,7 +298,7 @@ TmEcode NapatechStreamLoop(ThreadVars *tv, void *data, void *slot)
} }
NT_NetRxRelease(ntv->rx_stream, packet_buffer); NT_NetRxRelease(ntv->rx_stream, packet_buffer);
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

2
src/source-nfq.c
Unescape Escape View File

@ -988,7 +988,7 @@ TmEcode ReceiveNFQLoop(ThreadVars *tv, void *data, void *slot)
} }
NFQRecvPkt(nq, ntv); NFQRecvPkt(nq, ntv);
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }

2
src/source-pcap-file.c
Unescape Escape View File

@ -227,7 +227,7 @@ TmEcode ReceivePcapFileLoop(ThreadVars *tv, void *data, void *slot)
SCReturnInt(TM_ECODE_DONE); SCReturnInt(TM_ECODE_DONE);
} }
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

2
src/source-pcap.c
Unescape Escape View File

@ -342,7 +342,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);

2
src/source-pfring.c
Unescape Escape View File

@ -336,7 +336,7 @@ TmEcode ReceivePfringLoop(ThreadVars *tv, void *data, void *slot)
TmqhOutputPacketpool(ptv->tv, p); TmqhOutputPacketpool(ptv->tv, p);
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
} }
return TM_ECODE_OK; return TM_ECODE_OK;

12
src/tm-threads.c
Unescape Escape View File

@ -204,7 +204,7 @@ void *TmThreadsSlot1NoIn(void *td)
} }
if (TmThreadsCheckFlag(tv, THV_KILL)) { if (TmThreadsCheckFlag(tv, THV_KILL)) {
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
run = 0; run = 0;
} }
} /* while (run) */ } /* while (run) */
@ -296,7 +296,7 @@ void *TmThreadsSlot1NoOut(void *td)
} }
if (TmThreadsCheckFlag(tv, THV_KILL)) { if (TmThreadsCheckFlag(tv, THV_KILL)) {
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
run = 0; run = 0;
} }
} /* while (run) */ } /* while (run) */
@ -383,7 +383,7 @@ void *TmThreadsSlot1NoInOut(void *td)
} }
if (TmThreadsCheckFlag(tv, THV_KILL)) { if (TmThreadsCheckFlag(tv, THV_KILL)) {
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
run = 0; run = 0;
} }
} /* while (run) */ } /* while (run) */
@ -510,7 +510,7 @@ void *TmThreadsSlot1(void *td)
} }
if (TmThreadsCheckFlag(tv, THV_KILL)) { if (TmThreadsCheckFlag(tv, THV_KILL)) {
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
run = 0; run = 0;
} }
} /* while (run) */ } /* while (run) */
@ -710,7 +710,7 @@ void *TmThreadsSlotPktAcqLoop(void *td) {
run = 0; run = 0;
} }
} }
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
TmThreadsSetFlag(tv, THV_RUNNING_DONE); TmThreadsSetFlag(tv, THV_RUNNING_DONE);
TmThreadWaitForFlag(tv, THV_DEINIT); TmThreadWaitForFlag(tv, THV_DEINIT);
@ -857,7 +857,7 @@ void *TmThreadsSlotVar(void *td)
run = 0; run = 0;
} }
} /* while (run) */ } /* while (run) */
SCPerfSyncCounters(tv, 0); SCPerfSyncCounters(tv);
TmThreadsSetFlag(tv, THV_RUNNING_DONE); TmThreadsSetFlag(tv, THV_RUNNING_DONE);
TmThreadWaitForFlag(tv, THV_DEINIT); TmThreadWaitForFlag(tv, THV_DEINIT);

2
src/tmqh-flow.c
Unescape Escape View File

@ -85,7 +85,7 @@ Packet *TmqhInputFlow(ThreadVars *tv)
{ {
PacketQueue *q = &trans_q[tv->inq->id]; PacketQueue *q = &trans_q[tv->inq->id];
SCPerfSyncCountersIfSignalled(tv, 0); SCPerfSyncCountersIfSignalled(tv);
SCMutexLock(&q->mutex_q); SCMutexLock(&q->mutex_q);
if (q->len == 0) { if (q->len == 0) {

6
src/tmqh-ringbuffer.c
Unescape Escape View File

@ -101,7 +101,7 @@ Packet *TmqhInputRingBufferMrSw(ThreadVars *t)
Packet *p = (Packet *)RingBufferMrSw8Get(rb); Packet *p = (Packet *)RingBufferMrSw8Get(rb);
SCPerfSyncCountersIfSignalled(t, 0); SCPerfSyncCountersIfSignalled(t);
return p; return p;
} }
@ -118,7 +118,7 @@ Packet *TmqhInputRingBufferSrSw(ThreadVars *t)
Packet *p = (Packet *)RingBufferSrSw8Get(rb); Packet *p = (Packet *)RingBufferSrSw8Get(rb);
SCPerfSyncCountersIfSignalled(t, 0); SCPerfSyncCountersIfSignalled(t);
return p; return p;
} }
@ -135,7 +135,7 @@ Packet *TmqhInputRingBufferSrMw(ThreadVars *t)
Packet *p = (Packet *)RingBufferSrMw8Get(rb); Packet *p = (Packet *)RingBufferSrMw8Get(rb);
SCPerfSyncCountersIfSignalled(t, 0); SCPerfSyncCountersIfSignalled(t);
return p; return p;
} }

2
src/tmqh-simple.c
Unescape Escape View File

@ -46,7 +46,7 @@ Packet *TmqhInputSimple(ThreadVars *t)
{ {
PacketQueue *q = &trans_q[t->inq->id]; PacketQueue *q = &trans_q[t->inq->id];
SCPerfSyncCountersIfSignalled(t, 0); SCPerfSyncCountersIfSignalled(t);
SCMutexLock(&q->mutex_q); SCMutexLock(&q->mutex_q);

Write Preview
Loading…
Cancel
Save