* \param pca Counter array that holds the local counter for this TM
* \param x Value to add to this local counter
*/
-void SCPerfCounterAddUI64(ThreadVars *tv, uint16_t id, uint64_t x)
+void StatsAddUI64(ThreadVars *tv, uint16_t id, uint64_t x)
{
SCPerfPrivateContext *pca = &tv->perf_private_ctx;
#ifdef UNITTESTS
pca = &tv.perf_private_ctx;
SCPerfCounterIncr(&tv, id);
- SCPerfCounterAddUI64(&tv, id, 100);
+ StatsAddUI64(&tv, id, 100);
result = pca->head[id].value;
pca = &tv.perf_private_ctx;
SCPerfCounterIncr(&tv, id2);
- SCPerfCounterAddUI64(&tv, id2, 100);
+ StatsAddUI64(&tv, id2, 100);
result = (pca->head[id1].value == 0) && (pca->head[id2].value == 101);
pca = &tv.perf_private_ctx;
SCPerfCounterIncr(&tv, id1);
- SCPerfCounterAddUI64(&tv, id2, 100);
+ StatsAddUI64(&tv, id2, 100);
SCPerfCounterIncr(&tv, id3);
- SCPerfCounterAddUI64(&tv, id3, 100);
+ StatsAddUI64(&tv, id3, 100);
SCPerfUpdateCounterArray(pca, &tv.perf_public_ctx);
pca = &tv.perf_private_ctx;
SCPerfCounterIncr(&tv, id1);
- SCPerfCounterAddUI64(&tv, id2, 256);
- SCPerfCounterAddUI64(&tv, id3, 257);
- SCPerfCounterAddUI64(&tv, id4, 16843024);
+ StatsAddUI64(&tv, id2, 256);
+ StatsAddUI64(&tv, id3, 257);
+ StatsAddUI64(&tv, id4, 16843024);
SCPerfUpdateCounterArray(pca, &tv.perf_public_ctx);
void SCPerfReleasePCA(SCPerfPrivateContext *);
/* functions used to update local counter values */
-void SCPerfCounterAddUI64(struct ThreadVars_ *, uint16_t, uint64_t);
+void StatsAddUI64(struct ThreadVars_ *, uint16_t, uint64_t);
void SCPerfCounterSetUI64(struct ThreadVars_ *, uint16_t, uint64_t);
void SCPerfCounterIncr(struct ThreadVars_ *, uint16_t);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM);
#ifdef PROFILING
if (th_v) {
- SCPerfCounterAddUI64(th_v, det_ctx->counter_mpm_list,
+ StatsAddUI64(th_v, det_ctx->counter_mpm_list,
(uint64_t)det_ctx->pmq.rule_id_array_cnt);
- SCPerfCounterAddUI64(th_v, det_ctx->counter_nonmpm_list,
+ StatsAddUI64(th_v, det_ctx->counter_nonmpm_list,
(uint64_t)det_ctx->sgh->non_mpm_store_cnt);
/* non mpm sigs after mask prefilter */
- SCPerfCounterAddUI64(th_v, det_ctx->counter_fnonmpm_list,
+ StatsAddUI64(th_v, det_ctx->counter_fnonmpm_list,
(uint64_t)det_ctx->non_mpm_id_cnt);
}
#endif
SigIntId match_cnt = det_ctx->match_array_cnt;
#ifdef PROFILING
if (th_v) {
- SCPerfCounterAddUI64(th_v, det_ctx->counter_match_list,
+ StatsAddUI64(th_v, det_ctx->counter_match_list,
(uint64_t)match_cnt);
}
#endif
PACKET_PROFILING_DETECT_START(p, PROF_DETECT_ALERT);
PacketAlertFinalize(de_ctx, det_ctx, p);
if (p->alerts.cnt > 0) {
- SCPerfCounterAddUI64(th_v, det_ctx->counter_alerts, (uint64_t)p->alerts.cnt);
+ StatsAddUI64(th_v, det_ctx->counter_alerts, (uint64_t)p->alerts.cnt);
}
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_ALERT);
IPPairTimeoutHash(&ts);
}
/*
- SCPerfCounterAddUI64(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();
SCPerfCounterSetUI64(th_v, flow_mgr_host_active, (uint64_t)hosts_active);
uint32_t hosts_spare = HostGetSpareCount();
SCPerfCounterSetUI64(th_v, flow_mgr_host_spare, (uint64_t)hosts_spare);
*/
- SCPerfCounterAddUI64(th_v, ftd->flow_mgr_cnt_clo, (uint64_t)counters.clo);
- SCPerfCounterAddUI64(th_v, ftd->flow_mgr_cnt_new, (uint64_t)counters.new);
- SCPerfCounterAddUI64(th_v, ftd->flow_mgr_cnt_est, (uint64_t)counters.est);
+ 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_est, (uint64_t)counters.est);
long long unsigned int flow_memuse = SC_ATOMIC_GET(flow_memuse);
SCPerfCounterSetUI64(th_v, ftd->flow_mgr_memuse, (uint64_t)flow_memuse);
- SCPerfCounterAddUI64(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;
FQLOCK_LOCK(&flow_spare_q);
SCLogDebug("(%s) Kernel: Packets %" PRIu32 ", dropped %" PRIu32 "",
ptv->tv->name,
kstats.tp_packets, kstats.tp_drops);
- SCPerfCounterAddUI64(ptv->tv, ptv->capture_kernel_packets, kstats.tp_packets);
- SCPerfCounterAddUI64(ptv->tv, ptv->capture_kernel_drops, kstats.tp_drops);
+ StatsAddUI64(ptv->tv, ptv->capture_kernel_packets, kstats.tp_packets);
+ StatsAddUI64(ptv->tv, ptv->capture_kernel_drops, kstats.tp_drops);
(void) SC_ATOMIC_ADD(ptv->livedev->drop, (uint64_t) kstats.tp_drops);
(void) SC_ATOMIC_ADD(ptv->livedev->pkts, (uint64_t) kstats.tp_packets);
}
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
/* If suri has set vlan during reading, we increase vlan counter */
break;
case TYPE_ETH:
if (dr->lctr) {
- SCPerfCounterAddUI64(tv, ewtn->drops, ntohs(dr->lctr));
+ StatsAddUI64(tv, ewtn->drops, ntohs(dr->lctr));
}
break;
default:
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
/* call the decoder */
/* Update counters. */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
/* Process IP packets */
SCPerfCounterIncr(tv, dtv->counter_pkts);
// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(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));
/* call the decoder */
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
switch (p->datalink) {
*/
static inline void NetmapDumpCounters(NetmapThreadVars *ntv)
{
- SCPerfCounterAddUI64(ntv->tv, ntv->capture_kernel_packets, ntv->pkts);
- SCPerfCounterAddUI64(ntv->tv, ntv->capture_kernel_drops, ntv->drops);
+ StatsAddUI64(ntv->tv, ntv->capture_kernel_packets, ntv->pkts);
+ StatsAddUI64(ntv->tv, ntv->capture_kernel_drops, ntv->drops);
(void) SC_ATOMIC_ADD(ntv->livedev->drop, ntv->drops);
(void) SC_ATOMIC_ADD(ntv->livedev->pkts, ntv->pkts);
ntv->drops = 0;
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
DecodeThreadVars *dtv = (DecodeThreadVars *)data;
SCPerfCounterIncr(tv, dtv->counter_pkts);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
if (IPV4_GET_RAW_VER(ip4h) == 4) {
return TM_ECODE_OK;
SCPerfCounterIncr(tv, dtv->counter_pkts);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
if (IPV4_GET_RAW_VER(ip4h) == 4) {
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
double curr_ts = p->ts.tv_sec + p->ts.tv_usec / 1000.0;
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
/* call the decoder */
/* update counters */
SCPerfCounterIncr(tv, dtv->counter_pkts);
//SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec);
- SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p));
- SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p));
+ StatsAddUI64(tv, dtv->counter_bytes, 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));
/* If suri has set vlan during reading, we increase vlan counter */