Dispatch all allocator creations through a single function using an enum to

determine the desired type. This has two advantages over the old way:
 - just one environment variable for valgrind to override in order to guarantee
   that ALL allocators use memory it can track, and just one place to check that
   variable
 - allocator owners no longer have to include headers specific to their
   allocator, allowing them to change allocators without adjusting all their
   #includes

svn path=/trunk/; revision=46604

1 files changed, 25 insertions, 0 deletions

diff --git a/epan/wmem/wmem_core.c b/epan/wmem/wmem_core.c
index 82bde49ca1..9946c70a53 100644
--- a/epan/wmem/wmem_core.c
+++ b/epan/wmem/wmem_core.c
@@ -23,11 +23,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 
 #include "wmem_core.h"
 #include "wmem_scopes.h"
 #include "wmem_allocator.h"
+#include "wmem_allocator_simple.h"
+#include "wmem_allocator_block.h"
 
 void *
 wmem_alloc(wmem_allocator_t *allocator, const size_t size)
@@ -58,6 +62,27 @@ wmem_destroy_allocator(wmem_allocator_t *allocator)
     allocator->destroy(allocator);
 }
 
+wmem_allocator_t *
+wmem_allocator_new(const wmem_allocator_type_t type)
+{
+    /* Our valgrind script uses this environment variable to override the
+     * usual allocator choice so that everything goes through system-level
+     * allocations that it understands and can track. Otherwise it will get
+     * confused by the block allocator etc. */
+    if (getenv("WIRESHARK_DEBUG_WMEM_SIMPLE")) {
+        return wmem_simple_allocator_new();
+    }
+
+    switch (type) {
+        case WMEM_ALLOCATOR_SIMPLE:
+            return wmem_simple_allocator_new();
+        case WMEM_ALLOCATOR_BLOCK:
+            return wmem_block_allocator_new();
+        default:
+            g_assert_not_reached();
+    };
+}
+
 void
 wmem_init(void)
 {