aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2015-07-03 21:14:53 -0400
committerEvan Huus <eapache@gmail.com>2015-07-04 12:21:34 +0000
commitebae0c98f8556b9533cd1bb21c4bac548ab5e470 (patch)
treec1c00d293789181af907986dd1a0c68966b02f47 /epan/wmem
parentdd8311d2ed09c34fd7b7206ed9ea95b8cee7c85a (diff)
store tcp/udp port names in epan scope
This causes them to be freed on shutdown, cleaning up ~800KB of "reachable" memory according to valgrind. The fact that we even need to construct these as value_strings is questionable IMHO, but that's a problem for a later date. Switch epan_scope to the BLOCK allocator now that we're using it for so much more, this gives a small but measurable increase in startup time. Change-Id: I187460b769e28da3c6629abac1d9196727ae7dde Reviewed-on: https://code.wireshark.org/review/9483 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/wmem')
-rw-r--r--epan/wmem/wmem_scopes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/wmem/wmem_scopes.c b/epan/wmem/wmem_scopes.c
index 7ff17870e1..5eb6ab0d37 100644
--- a/epan/wmem/wmem_scopes.c
+++ b/epan/wmem/wmem_scopes.c
@@ -137,7 +137,7 @@ wmem_init_scopes(void)
packet_scope = wmem_allocator_new(WMEM_ALLOCATOR_BLOCK_FAST);
file_scope = wmem_allocator_new(WMEM_ALLOCATOR_BLOCK);
- epan_scope = wmem_allocator_new(WMEM_ALLOCATOR_SIMPLE);
+ epan_scope = wmem_allocator_new(WMEM_ALLOCATOR_BLOCK);
/* Scopes are initialized to TRUE by default on creation */
packet_scope->in_scope = FALSE;