From: Victor Julien Date: Sat, 23 May 2015 10:15:10 +0000 (+0200) Subject: counters: remove references to SCPerfCounterAddDouble X-Git-Tag: suricata-3.0RC1~393 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b34c6dc93aa5d280cd6fb611c24b61a7ed43a650;p=thirdparty%2Fsuricata.git counters: remove references to SCPerfCounterAddDouble They were all in comments anyway. --- diff --git a/src/source-af-packet.c b/src/source-af-packet.c index fa384fc345..6482ee759f 100644 --- a/src/source-af-packet.c +++ b/src/source-af-packet.c @@ -1857,15 +1857,8 @@ TmEcode DecodeAFP(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet /* update counters */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0); -#endif - SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); diff --git a/src/source-erf-dag.c b/src/source-erf-dag.c index b73f2fd6fa..910729b936 100644 --- a/src/source-erf-dag.c +++ b/src/source-erf-dag.c @@ -624,15 +624,8 @@ DecodeErfDag(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, /* update counters */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0); -#endif - SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); diff --git a/src/source-erf-file.c b/src/source-erf-file.c index ff39bedc2d..38fa57ca9f 100644 --- a/src/source-erf-file.c +++ b/src/source-erf-file.c @@ -285,15 +285,8 @@ DecodeErfFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, PacketQueu /* Update counters. */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0 ); -#endif - SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); diff --git a/src/source-nfq.c b/src/source-nfq.c index 12123b7752..a4a6ab73b6 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -1227,11 +1227,6 @@ TmEcode DecodeNFQ(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0); -#endif if (IPV4_GET_RAW_VER(ip4h) == 4) { SCLogDebug("IPv4 packet"); diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c index a1b1d04d44..8e7e0bfd09 100644 --- a/src/source-pcap-file.c +++ b/src/source-pcap-file.c @@ -402,14 +402,8 @@ TmEcode DecodePcapFile(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, P /* update counters */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0 ); -#endif SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); diff --git a/src/source-pcap.c b/src/source-pcap.c index 138db8496f..7a551d16ac 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -717,15 +717,8 @@ TmEcode DecodePcap(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packe /* update counters */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0); -#endif - SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p)); diff --git a/src/source-pfring.c b/src/source-pfring.c index 5708ddd8da..a6149e2af4 100644 --- a/src/source-pfring.c +++ b/src/source-pfring.c @@ -609,15 +609,8 @@ TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pac /* update counters */ SCPerfCounterIncr(tv, dtv->counter_pkts); -// SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); - + //SCPerfCounterIncr(tv, dtv->counter_pkts_per_sec); SCPerfCounterAddUI64(tv, dtv->counter_bytes, GET_PKT_LEN(p)); -#if 0 - SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->perf_private_ctx, GET_PKT_LEN(p)); - SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->perf_private_ctx, - (GET_PKT_LEN(p) * 8)/1000000.0 ); -#endif - SCPerfCounterAddUI64(tv, dtv->counter_avg_pkt_size, GET_PKT_LEN(p)); SCPerfCounterSetUI64(tv, dtv->counter_max_pkt_size, GET_PKT_LEN(p));