]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
counters: remove references to SCPerfCounterAddDouble
authorVictor Julien <victor@inliniac.net>
Sat, 23 May 2015 10:15:10 +0000 (12:15 +0200)
committerVictor Julien <victor@inliniac.net>
Tue, 26 May 2015 15:54:25 +0000 (17:54 +0200)
They were all in comments anyway.

src/source-af-packet.c
src/source-erf-dag.c
src/source-erf-file.c
src/source-nfq.c
src/source-pcap-file.c
src/source-pcap.c
src/source-pfring.c

index fa384fc345c695ad72f7e58004cc1742a51befd7..6482ee759f4d8f3fc9ebf0cdafddafd79fcdd333 100644 (file)
@@ -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));
 
index b73f2fd6fa9d2bd5595a0a8c02f0801f6013de78..910729b9365accb5236e5c70e09cf2e1a914020f 100644 (file)
@@ -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));
 
index ff39bedc2d2fe7a6475fb56e4a39429c903f6f35..38fa57ca9f7a7a39d2542cf85615ccff037f4d54 100644 (file)
@@ -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));
 
index 12123b7752a740ea51c57e09f1703a6d0279cce1..a4a6ab73b677ffacd215016382b1df85356f223a 100644 (file)
@@ -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");
index a1b1d04d4433388f0c07b87137aab486527108a2..8e7e0bfd0909cf5f17fb49e7df115a70bf9d52c7 100644 (file)
@@ -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));
 
index 138db8496fbc701266355a2e0d9a0784c361efe5..7a551d16ac228f2f69c2c0fd96c8e5646e1be257 100644 (file)
@@ -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));
 
index 5708ddd8dad71aeaf816219329080b5bfff48419..a6149e2af4bf9efced85078eecfbf7440093a4af 100644 (file)
@@ -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));