From: Victor Julien <victor@inliniac.net>
Date: Wed, 24 Feb 2016 12:39:10 +0000 (+0100)
Subject: flowbits: remove unused debugging code
X-Git-Tag: suricata-3.0.1RC1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c788a8c176fd2980cdb51db7d5c23fc1749280a;p=thirdparty%2Fsuricata.git

flowbits: remove unused debugging code
---

diff --git a/src/flow-bit.c b/src/flow-bit.c
index 2b4ef5ccfa..188fc6aae3 100644
--- a/src/flow-bit.c
+++ b/src/flow-bit.c
@@ -68,16 +68,6 @@ static void FlowBitAdd(Flow *f, uint16_t idx)
         fb->idx = idx;
         fb->next = NULL;
         GenericVarAppend(&f->flowvar, (GenericVar *)fb);
-
-        //printf("FlowBitAdd: adding flowbit with idx %" PRIu32 "\n", idx);
-#ifdef FLOWBITS_STATS
-        SCMutexLock(&flowbits_mutex);
-        flowbits_added++;
-        flowbits_memuse += sizeof(FlowBit);
-        if (flowbits_memuse > flowbits_memuse_max)
-            flowbits_memuse_max = flowbits_memuse;
-        SCMutexUnlock(&flowbits_mutex);
-#endif /* FLOWBITS_STATS */
     }
 }
 
@@ -89,19 +79,6 @@ static void FlowBitRemove(Flow *f, uint16_t idx)
 
     GenericVarRemove(&f->flowvar, (GenericVar *)fb);
     FlowBitFree(fb);
-
-    //printf("FlowBitRemove: remove flowbit with idx %" PRIu32 "\n", idx);
-#ifdef FLOWBITS_STATS
-    SCMutexLock(&flowbits_mutex);
-    flowbits_removed++;
-    if (flowbits_memuse >= sizeof(FlowBit))
-        flowbits_memuse -= sizeof(FlowBit);
-    else {
-        printf("ERROR: flowbits memory usage going below 0!\n");
-        flowbits_memuse = 0;
-    }
-    SCMutexUnlock(&flowbits_mutex);
-#endif /* FLOWBITS_STATS */
 }
 
 void FlowBitSetNoLock(Flow *f, uint16_t idx)
@@ -179,18 +156,6 @@ void FlowBitFree(FlowBit *fb)
         return;
 
     SCFree(fb);
-
-#ifdef FLOWBITS_STATS
-    SCMutexLock(&flowbits_mutex);
-    flowbits_removed++;
-    if (flowbits_memuse >= sizeof(FlowBit))
-        flowbits_memuse -= sizeof(FlowBit);
-    else {
-        printf("ERROR: flowbits memory usage going below 0!\n");
-        flowbits_memuse = 0;
-    }
-    SCMutexUnlock(&flowbits_mutex);
-#endif /* FLOWBITS_STATS */
 }
 
 
diff --git a/src/flow-private.h b/src/flow-private.h
index bd25960b2b..507b1aad7d 100644
--- a/src/flow-private.h
+++ b/src/flow-private.h
@@ -87,14 +87,5 @@ FlowConfig flow_config;
 /** flow memuse counter (atomic), for enforcing memcap limit */
 SC_ATOMIC_DECLARE(long long unsigned int, flow_memuse);
 
-//#define FLOWBITS_STATS
-#ifdef FLOWBITS_STATS
-uint64_t flowbits_memuse;
-uint64_t flowbits_memuse_max;
-uint32_t flowbits_added;
-uint32_t flowbits_removed;
-SCMutex flowbits_mutex;
-#endif /* FLOWBITS_STATS */
-
 #endif /* __FLOW_PRIVATE_H__ */
 
diff --git a/src/flow.c b/src/flow.c
index abd9e7e5fb..cae7c4c044 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -476,10 +476,6 @@ void FlowInitConfig(char quiet)
  *  \warning Not thread safe */
 static void FlowPrintStats (void)
 {
-#ifdef FLOWBITS_STATS
-    SCLogInfo("flowbits added: %" PRIu32 ", removed: %" PRIu32 ", max memory usage: %" PRIu32 "",
-        flowbits_added, flowbits_removed, flowbits_memuse_max);
-#endif /* FLOWBITS_STATS */
     return;
 }