diff options
| author | Evan Huus <eapache@gmail.com> | 2013-11-04 14:12:59 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-11-04 14:12:59 +0000 |
| commit | 8a0ef070007671308d69d2bb11a4393b4558ace9 (patch) | |
| tree | fa5175cdd19f5f37c8cec4031c9d7ce13bbbfd10 /epan/proto.h | |
| parent | ca7923f7d5fb9c393193cf7e2ad44edec40a4ef6 (diff) | |
Effectively remove the tree memory pool and port some of its behaviour to the
pinfo memory pool, they have exactly the same scope. Simplification and minor
performance win (one GHashTable we longer have to create/destroy on every
packet).
svn path=/trunk/; revision=53076
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/proto.h b/epan/proto.h index 273d74a764..e0b54fb83e 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -486,7 +486,6 @@ typedef struct { gboolean fake_protocols; gint count; struct _packet_info *pinfo; - wmem_allocator_t *mem_pool; } tree_data_t; /** Each proto_tree, proto_item is one of these. */ @@ -611,7 +610,7 @@ WS_DLL_PUBLIC void proto_tree_children_foreach(proto_tree *tree, #define PTREE_DATA(proto_tree) ((proto_tree)->tree_data) /** Retrieve the wmem_allocator_t from a proto_node */ -#define PNODE_POOL(proto_node) ((proto_node)->tree_data->mem_pool) +#define PNODE_POOL(proto_node) ((proto_node)->tree_data->pinfo->pool) /** Sets up memory used by proto routines. Called at program startup */ void proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_data), |