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

counters: s/SCPerfCounterSetUI64/StatsSetUI64/g

Browse Source
pull/1508/head
Victor Julien 11 years ago
parent 1c0b4ee0ae
commit 30cce2bd29
18 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
src/app-layer-htp-mem.c
Unescape Escape View File

@ -81,9 +81,9 @@ void HTPDecrMemuse(uint64_t size)
void HTPMemuseCounter(ThreadVars *tv, TcpReassemblyThreadCtx *trt) void HTPMemuseCounter(ThreadVars *tv, TcpReassemblyThreadCtx *trt)
{ {
uint64_t tmpval = SC_ATOMIC_GET(htp_memuse); uint64_t tmpval = SC_ATOMIC_GET(htp_memuse);
SCPerfCounterSetUI64(tv, trt->counter_htp_memuse, tmpval); StatsSetUI64(tv, trt->counter_htp_memuse, tmpval);
tmpval = SC_ATOMIC_GET(htp_memcap); tmpval = SC_ATOMIC_GET(htp_memcap);
SCPerfCounterSetUI64(tv, trt->counter_htp_memcap, tmpval); StatsSetUI64(tv, trt->counter_htp_memcap, tmpval);
return; return;
} }
/** /**

6
src/app-layer.c
Unescape Escape View File

@ -78,9 +78,9 @@ static void DNSUpdateCounters(ThreadVars *tv, AppLayerThreadCtx *app_tctx)
DNSMemcapGetCounters(&memuse, &memcap_state, &memcap_global); DNSMemcapGetCounters(&memuse, &memcap_state, &memcap_global);
SCPerfCounterSetUI64(tv, app_tctx->counter_dns_memuse, memuse); StatsSetUI64(tv, app_tctx->counter_dns_memuse, memuse);
SCPerfCounterSetUI64(tv, app_tctx->counter_dns_memcap_state, memcap_state); StatsSetUI64(tv, app_tctx->counter_dns_memcap_state, memcap_state);
SCPerfCounterSetUI64(tv, app_tctx->counter_dns_memcap_global, memcap_global); StatsSetUI64(tv, app_tctx->counter_dns_memcap_global, memcap_global);
} }
/***** L7 layer dispatchers *****/ /***** L7 layer dispatchers *****/

2
src/counters.c
Unescape Escape View File

@ -162,7 +162,7 @@ void StatsIncr(ThreadVars *tv, uint16_t id)
* \param pca Pointer to the SCPerfPrivateContext * \param pca Pointer to the SCPerfPrivateContext
* \param x The value to set for the counter * \param x The value to set for the counter
*/ */
void SCPerfCounterSetUI64(ThreadVars *tv, uint16_t id, uint64_t x) void StatsSetUI64(ThreadVars *tv, uint16_t id, uint64_t x)
{ {
SCPerfPrivateContext *pca = &tv->perf_private_ctx; SCPerfPrivateContext *pca = &tv->perf_private_ctx;
#ifdef UNITTESTS #ifdef UNITTESTS

2
src/counters.h
Unescape Escape View File

@ -125,7 +125,7 @@ void SCPerfReleasePCA(SCPerfPrivateContext *);
/* functions used to update local counter values */ /* functions used to update local counter values */
void StatsAddUI64(struct ThreadVars_ *, uint16_t, uint64_t); void StatsAddUI64(struct ThreadVars_ *, uint16_t, uint64_t);
void SCPerfCounterSetUI64(struct ThreadVars_ *, uint16_t, uint64_t); void StatsSetUI64(struct ThreadVars_ *, uint16_t, uint64_t);
void StatsIncr(struct ThreadVars_ *, uint16_t); void StatsIncr(struct ThreadVars_ *, uint16_t);
#define SCPerfSyncCounters(tv) \ #define SCPerfSyncCounters(tv) \

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

@ -623,22 +623,22 @@ static TmEcode FlowManager(ThreadVars *th_v, void *thread_data)
/* /*
StatsAddUI64(th_v, flow_mgr_host_prune, (uint64_t)hosts_pruned); StatsAddUI64(th_v, flow_mgr_host_prune, (uint64_t)hosts_pruned);
uint32_t hosts_active = HostGetActiveCount(); uint32_t hosts_active = HostGetActiveCount();
SCPerfCounterSetUI64(th_v, flow_mgr_host_active, (uint64_t)hosts_active); StatsSetUI64(th_v, flow_mgr_host_active, (uint64_t)hosts_active);
uint32_t hosts_spare = HostGetSpareCount(); uint32_t hosts_spare = HostGetSpareCount();
SCPerfCounterSetUI64(th_v, flow_mgr_host_spare, (uint64_t)hosts_spare); StatsSetUI64(th_v, flow_mgr_host_spare, (uint64_t)hosts_spare);
*/ */
StatsAddUI64(th_v, ftd->flow_mgr_cnt_clo, (uint64_t)counters.clo); StatsAddUI64(th_v, ftd->flow_mgr_cnt_clo, (uint64_t)counters.clo);
StatsAddUI64(th_v, ftd->flow_mgr_cnt_new, (uint64_t)counters.new); StatsAddUI64(th_v, ftd->flow_mgr_cnt_new, (uint64_t)counters.new);
StatsAddUI64(th_v, ftd->flow_mgr_cnt_est, (uint64_t)counters.est); StatsAddUI64(th_v, ftd->flow_mgr_cnt_est, (uint64_t)counters.est);
long long unsigned int flow_memuse = SC_ATOMIC_GET(flow_memuse); long long unsigned int flow_memuse = SC_ATOMIC_GET(flow_memuse);
SCPerfCounterSetUI64(th_v, ftd->flow_mgr_memuse, (uint64_t)flow_memuse); StatsSetUI64(th_v, ftd->flow_mgr_memuse, (uint64_t)flow_memuse);
StatsAddUI64(th_v, ftd->flow_tcp_reuse, (uint64_t)counters.tcp_reuse); StatsAddUI64(th_v, ftd->flow_tcp_reuse, (uint64_t)counters.tcp_reuse);
uint32_t len = 0; uint32_t len = 0;
FQLOCK_LOCK(&flow_spare_q); FQLOCK_LOCK(&flow_spare_q);
len = flow_spare_q.len; len = flow_spare_q.len;
FQLOCK_UNLOCK(&flow_spare_q); FQLOCK_UNLOCK(&flow_spare_q);
SCPerfCounterSetUI64(th_v, ftd->flow_mgr_spare, (uint64_t)len); StatsSetUI64(th_v, ftd->flow_mgr_spare, (uint64_t)len);
/* Don't fear, FlowManagerThread is here... /* Don't fear, FlowManagerThread is here...
* clear emergency bit if we have at least xx flows pruned. */ * clear emergency bit if we have at least xx flows pruned. */

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

@ -1856,7 +1856,7 @@ TmEcode DecodeAFP(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* If suri has set vlan during reading, we increase vlan counter */ /* If suri has set vlan during reading, we increase vlan counter */
if (p->vlan_idx) { if (p->vlan_idx) {

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

@ -625,7 +625,7 @@ DecodeErfDag(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* call the decoder */ /* call the decoder */
switch(p->datalink) { switch(p->datalink) {

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

@ -288,7 +288,7 @@ DecodeErfFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueu
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq); DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);

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

@ -455,7 +455,7 @@ TmEcode DecodeIPFW(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packe
StatsIncr(tv, dtv->counter_pkts); StatsIncr(tv, dtv->counter_pkts);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* Process IP packets */ /* Process IP packets */
if (IPV4_GET_RAW_VER(ip4h) == 4) { if (IPV4_GET_RAW_VER(ip4h) == 4) {

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

@ -382,7 +382,7 @@ TmEcode ReceiveMpipeLoop(ThreadVars *tv, void *data, void *slot)
__insn_prefetch(&idesc[i]); __insn_prefetch(&idesc[i]);
} }
if (unlikely(n > max_queued)) { if (unlikely(n > max_queued)) {
SCPerfCounterSetUI64(tv, ptv->max_mpipe_depth, StatsSetUI64(tv, ptv->max_mpipe_depth,
(uint64_t)n); (uint64_t)n);
max_queued = n; max_queued = n;
} }
@ -1045,7 +1045,7 @@ TmEcode DecodeMpipe(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* call the decoder */ /* call the decoder */
DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq); DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);

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

@ -361,7 +361,7 @@ TmEcode NapatechDecode(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
// StatsIncr(tv, dtv->counter_pkts_per_sec); // StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
switch (p->datalink) { switch (p->datalink) {
case LINKTYPE_ETHERNET: case LINKTYPE_ETHERNET:

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

@ -933,7 +933,7 @@ static TmEcode DecodeNetmap(ThreadVars *tv, Packet *p, void *data, PacketQueue *
StatsIncr(tv, dtv->counter_pkts); StatsIncr(tv, dtv->counter_pkts);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq); DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);

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

@ -502,7 +502,7 @@ TmEcode DecodeNFLOG(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pack
StatsIncr(tv, dtv->counter_pkts); StatsIncr(tv, dtv->counter_pkts);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
if (IPV4_GET_RAW_VER(ip4h) == 4) { if (IPV4_GET_RAW_VER(ip4h) == 4) {
SCLogDebug("IPv4 packet"); SCLogDebug("IPv4 packet");

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

@ -1226,7 +1226,7 @@ TmEcode DecodeNFQ(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet
StatsIncr(tv, dtv->counter_pkts); StatsIncr(tv, dtv->counter_pkts);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
if (IPV4_GET_RAW_VER(ip4h) == 4) { if (IPV4_GET_RAW_VER(ip4h) == 4) {
SCLogDebug("IPv4 packet"); SCLogDebug("IPv4 packet");

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

@ -405,7 +405,7 @@ TmEcode DecodePcapFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, P
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
double curr_ts = p->ts.tv_sec + p->ts.tv_usec / 1000.0; double curr_ts = p->ts.tv_sec + p->ts.tv_usec / 1000.0;
if (curr_ts < prev_signaled_ts || (curr_ts - prev_signaled_ts) > 60.0) { if (curr_ts < prev_signaled_ts || (curr_ts - prev_signaled_ts) > 60.0) {

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

@ -155,10 +155,10 @@ static inline void PcapDumpCounters(PcapThreadVars *ptv)
{ {
struct pcap_stat pcap_s; struct pcap_stat pcap_s;
if (likely((pcap_stats(ptv->pcap_handle, &pcap_s) >= 0))) { if (likely((pcap_stats(ptv->pcap_handle, &pcap_s) >= 0))) {
SCPerfCounterSetUI64(ptv->tv, ptv->capture_kernel_packets, pcap_s.ps_recv); StatsSetUI64(ptv->tv, ptv->capture_kernel_packets, pcap_s.ps_recv);
SCPerfCounterSetUI64(ptv->tv, ptv->capture_kernel_drops, pcap_s.ps_drop); StatsSetUI64(ptv->tv, ptv->capture_kernel_drops, pcap_s.ps_drop);
(void) SC_ATOMIC_SET(ptv->livedev->drop, pcap_s.ps_drop); (void) SC_ATOMIC_SET(ptv->livedev->drop, pcap_s.ps_drop);
SCPerfCounterSetUI64(ptv->tv, ptv->capture_kernel_ifdrops, pcap_s.ps_ifdrop); StatsSetUI64(ptv->tv, ptv->capture_kernel_ifdrops, pcap_s.ps_ifdrop);
} }
} }
@ -708,7 +708,7 @@ TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packe
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* call the decoder */ /* call the decoder */
switch(p->datalink) { switch(p->datalink) {

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

@ -202,8 +202,8 @@ static inline void PfringDumpCounters(PfringThreadVars *ptv)
uint64_t th_drops = SCPerfGetLocalCounterValue(ptv->tv, ptv->capture_kernel_drops); uint64_t th_drops = SCPerfGetLocalCounterValue(ptv->tv, ptv->capture_kernel_drops);
SC_ATOMIC_ADD(ptv->livedev->pkts, pfring_s.recv - th_pkts); SC_ATOMIC_ADD(ptv->livedev->pkts, pfring_s.recv - th_pkts);
SC_ATOMIC_ADD(ptv->livedev->drop, pfring_s.drop - th_drops); SC_ATOMIC_ADD(ptv->livedev->drop, pfring_s.drop - th_drops);
SCPerfCounterSetUI64(ptv->tv, ptv->capture_kernel_packets, pfring_s.recv); StatsSetUI64(ptv->tv, ptv->capture_kernel_packets, pfring_s.recv);
SCPerfCounterSetUI64(ptv->tv, ptv->capture_kernel_drops, pfring_s.drop); StatsSetUI64(ptv->tv, ptv->capture_kernel_drops, pfring_s.drop);
} }
} }
@ -606,7 +606,7 @@ TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pac
//StatsIncr(tv, dtv->counter_pkts_per_sec); //StatsIncr(tv, dtv->counter_pkts_per_sec);
StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); StatsAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); StatsSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));
/* If suri has set vlan during reading, we increase vlan counter */ /* If suri has set vlan during reading, we increase vlan counter */
if (p->vlan_idx) { if (p->vlan_idx) {

2
src/stream-tcp.c
Unescape Escape View File

@ -148,7 +148,7 @@ void StreamTcpDecrMemuse(uint64_t size)
void StreamTcpMemuseCounter(ThreadVars *tv, StreamTcpThread *stt) void StreamTcpMemuseCounter(ThreadVars *tv, StreamTcpThread *stt)
{ {
uint64_t memusecopy = SC_ATOMIC_GET(st_memuse); uint64_t memusecopy = SC_ATOMIC_GET(st_memuse);
SCPerfCounterSetUI64(tv, stt->counter_tcp_memuse, memusecopy); StatsSetUI64(tv, stt->counter_tcp_memuse, memusecopy);
return; return;
} }

Write Preview
Loading…
Cancel
Save