From 19fdb26ab7d4f6d2bcceb9ad139670c0ab740468 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Mon, 21 Sep 2015 14:39:43 +0200
Subject: [PATCH] Don't leak statistics we want to ignore for aardvark

---
 arangod/Statistics/statistics.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/arangod/Statistics/statistics.cpp b/arangod/Statistics/statistics.cpp
index 8af6f9f365..b094e3e4db 100644
--- a/arangod/Statistics/statistics.cpp
+++ b/arangod/Statistics/statistics.cpp
@@ -54,13 +54,13 @@ static triagens::basics::Mutex RequestDataLock;
 /// @brief the request statistics queue
 ////////////////////////////////////////////////////////////////////////////////
 
-boost::lockfree::queue<TRI_request_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> RequestFreeList;
+static boost::lockfree::queue<TRI_request_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> RequestFreeList;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief the request statistics queue for finished requests
 ////////////////////////////////////////////////////////////////////////////////
 
-boost::lockfree::queue<TRI_request_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> RequestFinishedList;
+static boost::lockfree::queue<TRI_request_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> RequestFinishedList;
 
 // -----------------------------------------------------------------------------
 // --SECTION--                              private request statistics functions
@@ -171,6 +171,16 @@ void TRI_ReleaseRequestStatistics (TRI_request_statistics_t* statistics) {
     TRI_ASSERT(ok);
 #else
     RequestFinishedList.push(statistics);
+#endif
+  }
+  else {
+    statistics->reset(); 
+
+#ifdef TRI_ENABLE_MAINTAINER_MODE
+    bool ok = RequestFreeList.push(statistics);
+    TRI_ASSERT(ok);
+#else
+    RequestFreeList.push(statistics);
 #endif
   }
 }
@@ -209,7 +219,7 @@ static triagens::basics::Mutex ConnectionDataLock;
 /// @brief free list
 ////////////////////////////////////////////////////////////////////////////////
 
-boost::lockfree::queue<TRI_connection_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> ConnectionFreeList;
+static boost::lockfree::queue<TRI_connection_statistics_t*, boost::lockfree::capacity<QUEUE_SIZE>> ConnectionFreeList;
 
 // -----------------------------------------------------------------------------
 // --SECTION--                            public connection statistics functions