decode: clean DecodeThreadVars counter

Speed counters are not compute anymore and can be removed from the
structure definition.

diff --git a/src/decode.c b/src/decode.c
index 4aef9094b2422afcc51424fd5ed9780390acbe99..65deed8e0aac227e4dee65ada55c9be9197e0209 100644 (file)
--- a/src/decode.c
+++ b/src/decode.c
@@ -352,24 +352,10 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *dtv, ThreadVars *tv)
     /* register counters */
     dtv->counter_pkts = SCPerfTVRegisterCounter("decoder.pkts", tv,
                                                 SC_PERF_TYPE_UINT64, "NULL");
-#if 0
-    dtv->counter_pkts_per_sec = SCPerfTVRegisterIntervalCounter("decoder.pkts_per_sec",
-                                                                tv, SC_PERF_TYPE_DOUBLE,
-                                                                "NULL", "1s");
-#endif
     dtv->counter_bytes = SCPerfTVRegisterCounter("decoder.bytes", tv,
                                                  SC_PERF_TYPE_UINT64, "NULL");
-
     dtv->counter_invalid = SCPerfTVRegisterCounter("decoder.invalid", tv,
                                                  SC_PERF_TYPE_UINT64, "NULL");
-#if 0
-    dtv->counter_bytes_per_sec = SCPerfTVRegisterIntervalCounter("decoder.bytes_per_sec",
-                                                                tv, SC_PERF_TYPE_DOUBLE,
-                                                                "NULL", "1s");
-    dtv->counter_mbit_per_sec = SCPerfTVRegisterIntervalCounter("decoder.mbit_per_sec",
-                                                                tv, SC_PERF_TYPE_DOUBLE,
-                                                                "NULL", "1s");
-#endif
     dtv->counter_ipv4 = SCPerfTVRegisterCounter("decoder.ipv4", tv,
                                                 SC_PERF_TYPE_UINT64, "NULL");
     dtv->counter_ipv6 = SCPerfTVRegisterCounter("decoder.ipv6", tv,

diff --git a/src/decode.h b/src/decode.h
index 5011697d2913cb79d425abf0eeb67f2d05baadea..1d9555f66d39e30bc96736df740ffc41bbe92578 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -583,11 +583,8 @@ typedef struct DecodeThreadVars_
 
     /** stats/counters */
     uint16_t counter_pkts;
-    uint16_t counter_pkts_per_sec;
     uint16_t counter_bytes;
     uint16_t counter_invalid;
-    uint16_t counter_bytes_per_sec;
-    uint16_t counter_mbit_per_sec;
     uint16_t counter_ipv4;
     uint16_t counter_ipv6;
     uint16_t counter_eth;