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

counters: remove references to SCPerfCounterAddDouble

Browse Source 
They were all in comments anyway.
pull/1508/head
Victor Julien 10 years ago
parent e9b067c1eb
commit b34c6dc93a
7 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File

9
src/source-af-packet.c
Unescape Escape View 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));

9
src/source-erf-dag.c
Unescape Escape View 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));

9
src/source-erf-file.c
Unescape Escape View 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));

5
src/source-nfq.c
Unescape Escape View 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");

8
src/source-pcap-file.c
Unescape Escape View 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));

9
src/source-pcap.c
Unescape Escape View 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));

9
src/source-pfring.c
Unescape Escape View 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));

Write Preview
Loading…
Cancel
Save