counters: make tcp.memuse a global counter

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index d5f90c8fbb601107da7dd8e442691876f778cba9..9f2fbefd620b08c478aa4c1969249b91c1754792 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -146,11 +146,10 @@ void StreamTcpDecrMemuse(uint64_t size)
     return;
 }
 
-void StreamTcpMemuseCounter(ThreadVars *tv, StreamTcpThread *stt)
+uint64_t StreamTcpMemuseCounter(void)
 {
     uint64_t memusecopy = SC_ATOMIC_GET(st_memuse);
-    StatsSetUI64(tv, stt->counter_tcp_memuse, memusecopy);
-    return;
+    return memusecopy;
 }
 
 /**
@@ -593,6 +592,7 @@ void StreamTcpInitConfig(char quiet)
 
     /* init the memcap/use tracking */
     SC_ATOMIC_INIT(st_memuse);
+    StatsRegisterGlobalCounter("tcp.memuse", StreamTcpMemuseCounter);
 
     StreamTcpReassembleInit(quiet);
 
@@ -4654,7 +4654,6 @@ int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt,
         }
     }
 
-    StreamTcpMemuseCounter(tv, stt);
     SCReturnInt(0);
 
 error:
@@ -5080,7 +5079,6 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
     stt->counter_tcp_pseudo_failed = StatsRegisterCounter("tcp.pseudo_failed", tv);
     stt->counter_tcp_invalid_checksum = StatsRegisterCounter("tcp.invalid_checksum", tv);
     stt->counter_tcp_no_flow = StatsRegisterCounter("tcp.no_flow", tv);
-    stt->counter_tcp_memuse = StatsRegisterCounter("tcp.memuse", tv);
     stt->counter_tcp_syn = StatsRegisterCounter("tcp.syn", tv);
     stt->counter_tcp_synack = StatsRegisterCounter("tcp.synack", tv);
     stt->counter_tcp_rst = StatsRegisterCounter("tcp.rst", tv);

diff --git a/src/stream-tcp.h b/src/stream-tcp.h
index dcafe0e9bcc76f18870d321b7437e953ea00c44b..f7c3ab108b2cf370f699bfdc878e34496b5ff220 100644 (file)
--- a/src/stream-tcp.h
+++ b/src/stream-tcp.h
@@ -100,8 +100,6 @@ typedef struct StreamTcpThread_ {
     uint16_t counter_tcp_no_flow;
     /** sessions reused */
     uint16_t counter_tcp_reused_ssn;
-    /** sessions reused */
-    uint16_t counter_tcp_memuse;
     /** syn pkts */
     uint16_t counter_tcp_syn;
     /** syn/ack pkts */