osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Store the type of each wmem allocator. 

svn path=/trunk/; revision=46814
This commit is contained in:
Evan Huus 2012-12-27 22:31:42 +00:00
parent 347a8a2115
commit dc98756ca4
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/wmem/wmem_allocator.h
View File

@ -32,12 +32,15 @@
extern "C" {
#endif /* __cplusplus */
typedef enum _wmem_allocator_type_t wmem_allocator_type_t;
struct _wmem_allocator_t {
void *(*alloc)(void *private_data, const size_t size);
void (*free_all)(void *private_data);
void (*destroy)(struct _wmem_allocator_t *allocator);
void *private_data;
void *private_data;
wmem_allocator_type_t type;
};
#ifdef __cplusplus

16
epan/wmem/wmem_core.c
View File

@ -65,19 +65,25 @@ wmem_destroy_allocator(wmem_allocator_t *allocator)
wmem_allocator_t *
wmem_allocator_new(const wmem_allocator_type_t type)
{
wmem_allocator_t *allocator;
/* 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();
allocator = wmem_simple_allocator_new();
allocator->type = WMEM_ALLOCATOR_SIMPLE;
return allocator;
}
switch (type) {
case WMEM_ALLOCATOR_SIMPLE:
return wmem_simple_allocator_new();
allocator = wmem_simple_allocator_new();
break;
case WMEM_ALLOCATOR_BLOCK:
return wmem_block_allocator_new();
allocator = wmem_block_allocator_new();
break;
default:
g_assert_not_reached();
/* This is necessary to squelch MSVC errors; is there
@ -85,6 +91,10 @@ wmem_allocator_new(const wmem_allocator_type_t type)
never returns? */
return NULL;
};
allocator->type = type;
return allocator;
}
void