*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <glib.h>
+#include "app_mem_usage.h"
#include "proto.h"
+#include "exceptions.h"
#include "emem.h"
+#include "wmem/wmem.h"
#ifdef _WIN32
#include <windows.h> /* VirtualAlloc, VirtualProtect */
#include <process.h> /* getpid */
#endif
-/*
- * Tools like Valgrind and ElectricFence don't work well with memchunks.
- * Export the following environment variables to make {ep|se}_alloc() allocate each
- * object individually.
- *
- * WIRESHARK_DEBUG_EP_NO_CHUNKS
- * WIRESHARK_DEBUG_SE_NO_CHUNKS
- */
-static gboolean ep_debug_use_chunks;
-static gboolean se_debug_use_chunks;
-
-/* Do we want to use canaries?
- * Export the following environment variables to disable/enable canaries
- *
- * WIRESHARK_DEBUG_EP_NO_CANARY
- * For SE memory use of canary is default off as the memory overhead
- * is considerable.
- * WIRESHARK_DEBUG_SE_USE_CANARY
- */
-static gboolean ep_debug_use_canary;
-static gboolean se_debug_use_canary;
-
/* Print out statistics about our memory allocations? */
/*#define SHOW_EMEM_STATS*/
#ifdef WANT_GUARD_PAGES
/* Add guard pages at each end of our allocated memory */
+
#if defined(HAVE_SYSCONF) && defined(HAVE_MMAP) && defined(HAVE_MPROTECT) && defined(HAVE_STDINT_H)
#include <stdint.h>
+
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif /* HAVE_SYS_TYPES_H */
+
#include <sys/mman.h>
+
#if defined(MAP_ANONYMOUS)
#define ANON_PAGE_MODE (MAP_ANONYMOUS|MAP_PRIVATE)
#elif defined(MAP_ANON)
#else
#define ANON_PAGE_MODE (MAP_PRIVATE) /* have to map /dev/zero */
#define NEED_DEV_ZERO
-#endif
+#endif /* defined(MAP_ANONYMOUS) */
+
#ifdef NEED_DEV_ZERO
#include <fcntl.h>
static int dev_zero_fd;
#define ANON_FD dev_zero_fd
#else
#define ANON_FD -1
-#endif
+#endif /* NEED_DEV_ZERO */
+
#define USE_GUARD_PAGES 1
-#endif
-#endif
+#endif /* defined(HAVE_SYSCONF) && defined(HAVE_MMAP) && defined(HAVE_MPROTECT) && defined(HAVE_STDINT_H) */
+#endif /* WANT_GUARD_PAGES */
/* When required, allocate more memory from the OS in this size chunks */
-#define EMEM_PACKET_CHUNK_SIZE 10485760
-
-/* The maximum number of allocations per chunk */
-#define EMEM_ALLOCS_PER_CHUNK (EMEM_PACKET_CHUNK_SIZE / 64)
+#define EMEM_PACKET_CHUNK_SIZE (10 * 1024 * 1024)
+/* The canary between allocations is at least 8 bytes and up to 16 bytes to
+ * allow future allocations to be 4- or 8-byte aligned.
+ * All but the last byte of the canary are randomly generated; the last byte is
+ * NULL to separate the canary and the pointer to the next canary.
+ *
+ * For example, if the allocation is a multiple of 8 bytes, the canary and
+ * pointer would look like:
+ * |0|1|2|3|4|5|6|7||0|1|2|3|4|5|6|7|
+ * |c|c|c|c|c|c|c|0||p|p|p|p|p|p|p|p| (64-bit), or:
+ * |c|c|c|c|c|c|c|0||p|p|p|p| (32-bit)
+ *
+ * If the allocation was, for example, 12 bytes, the canary would look like:
+ * |0|1|2|3|4|5|6|7||0|1|2|3|4|5|6|7|
+ * [...]|a|a|a|a|c|c|c|c||c|c|c|c|c|c|c|0| (followed by the pointer)
+ */
#define EMEM_CANARY_SIZE 8
#define EMEM_CANARY_DATA_SIZE (EMEM_CANARY_SIZE * 2 - 1)
-/* this should be static, but if it were gdb would had problems finding it */
-guint8 ep_canary[EMEM_CANARY_DATA_SIZE];
-guint8 se_canary[EMEM_CANARY_DATA_SIZE];
-
-typedef struct _emem_no_chunk_t {
- unsigned int c_count;
- void *canary[EMEM_ALLOCS_PER_CHUNK];
- guint8 cmp_len[EMEM_ALLOCS_PER_CHUNK];
-} emem_canary_t;
-
typedef struct _emem_chunk_t {
struct _emem_chunk_t *next;
- char *buf;
+ char *buf;
+ size_t size;
unsigned int amount_free_init;
unsigned int amount_free;
unsigned int free_offset_init;
unsigned int free_offset;
- emem_canary_t *canary_info;
+ void *canary_last;
} emem_chunk_t;
-typedef struct _emem_header_t {
+typedef struct _emem_pool_t {
emem_chunk_t *free_list;
emem_chunk_t *used_list;
-} emem_header_t;
-static emem_header_t ep_packet_mem;
-static emem_header_t se_packet_mem;
+ emem_tree_t *trees; /* only used by se_mem allocator */
+
+ guint8 canary[EMEM_CANARY_DATA_SIZE];
+ void *(*memory_alloc)(size_t size, struct _emem_pool_t *);
+
+ /*
+ * Tools like Valgrind and ElectricFence don't work well with memchunks.
+ * Export the following environment variables to make {ep|se}_alloc() allocate each
+ * object individually.
+ *
+ * WIRESHARK_DEBUG_EP_NO_CHUNKS
+ * WIRESHARK_DEBUG_SE_NO_CHUNKS
+ */
+ gboolean debug_use_chunks;
+
+ /* Do we want to use canaries?
+ * Export the following environment variables to disable/enable canaries
+ *
+ * WIRESHARK_DEBUG_EP_NO_CANARY
+ * For SE memory use of canary is default off as the memory overhead
+ * is considerable.
+ * WIRESHARK_DEBUG_SE_USE_CANARY
+ */
+ gboolean debug_use_canary;
+
+ /* Do we want to verify no one is using a pointer to an ep_ or se_
+ * allocated thing where they shouldn't be?
+ *
+ * Export WIRESHARK_EP_VERIFY_POINTERS or WIRESHARK_SE_VERIFY_POINTERS
+ * to turn this on.
+ */
+ gboolean debug_verify_pointers;
+
+} emem_pool_t;
+
+static emem_pool_t ep_packet_mem;
+static emem_pool_t se_packet_mem;
+
+/*
+ * Memory scrubbing is expensive but can be useful to ensure we don't:
+ * - use memory before initializing it
+ * - use memory after freeing it
+ * Export WIRESHARK_DEBUG_SCRUB_MEMORY to turn it on.
+ */
+static gboolean debug_use_memory_scrubber = FALSE;
#if defined (_WIN32)
static SYSTEM_INFO sysinfo;
-static OSVERSIONINFO versinfo;
+static gboolean iswindowsplatform;
static int pagesize;
#elif defined(USE_GUARD_PAGES)
static intptr_t pagesize;
#endif /* _WIN32 / USE_GUARD_PAGES */
+static void *emem_alloc_chunk(size_t size, emem_pool_t *mem);
+static void *emem_alloc_glib(size_t size, emem_pool_t *mem);
+
/*
* Set a canary value to be placed between memchunks.
*/
static void
-emem_canary(guint8 *canary) {
+emem_canary_init(guint8 *canary)
+{
int i;
- static GRand *rand_state = NULL;
+ static GRand *rand_state = NULL;
if (rand_state == NULL) {
rand_state = g_rand_new();
}
for (i = 0; i < EMEM_CANARY_DATA_SIZE; i ++) {
- canary[i] = (guint8) g_rand_int(rand_state);
+ canary[i] = (guint8) g_rand_int_range(rand_state, 1, 0x100);
}
return;
}
+static void *
+emem_canary_next(guint8 *mem_canary, guint8 *canary, int *len)
+{
+ void *ptr;
+ int i;
+
+ for (i = 0; i < EMEM_CANARY_SIZE-1; i++)
+ if (mem_canary[i] != canary[i])
+ return (void *) -1;
+
+ for (; i < EMEM_CANARY_DATA_SIZE; i++) {
+ if (canary[i] == '\0') {
+ memcpy(&ptr, &canary[i+1], sizeof(void *));
+
+ if (len)
+ *len = i + 1 + (int)sizeof(void *);
+ return ptr;
+ }
+
+ if (mem_canary[i] != canary[i])
+ return (void *) -1;
+ }
+
+ return (void *) -1;
+}
+
/*
- * Given an allocation size, return the amount of padding needed for
- * the canary value.
+ * Given an allocation size, return the amount of room needed for the canary
+ * (with a minimum of 8 bytes) while using the canary to pad to an 8-byte
+ * boundary.
*/
static guint8
-emem_canary_pad (size_t allocation) {
+emem_canary_pad (size_t allocation)
+{
guint8 pad;
pad = EMEM_CANARY_SIZE - (allocation % EMEM_CANARY_SIZE);
/* used to intensivelly check ep canaries
*/
-void ep_check_canary_integrity(const char* fmt, ...) {
+void
+ep_check_canary_integrity(const char* fmt, ...)
+{
va_list ap;
static gchar there[128] = {
'L','a','u','n','c','h',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
if (! intense_canary_checking ) return;
- here[126] = '\0';
- here[127] = '\0';
-
va_start(ap,fmt);
- g_vsnprintf(here, 126,fmt, ap);
+ g_vsnprintf(here, sizeof(here), fmt, ap);
va_end(ap);
for (npc = ep_packet_mem.free_list; npc != NULL; npc = npc->next) {
- static unsigned i_ctr;
+ void *canary_next = npc->canary_last;
- if (npc->canary_info->c_count > 0x00ffffff) {
- g_error("ep_packet_mem.free_list was corrupted\nbetween: %s\nand: %s",there, here);
- }
+ while (canary_next != NULL) {
+ canary_next = emem_canary_next(ep_packet_mem.canary, canary_next, NULL);
+ /* XXX, check if canary_next is inside allocated memory? */
- for (i_ctr = 0; i_ctr < npc->canary_info->c_count; i_ctr++) {
- if (memcmp(npc->canary_info->canary[i_ctr], &ep_canary, npc->canary_info->cmp_len[i_ctr]) != 0) {
- g_error("Per-packet memory corrupted\nbetween: %s\nand: %s",there, here);
- }
+ if (canary_next == (void *) -1)
+ g_error("Per-packet memory corrupted\nbetween: %s\nand: %s", there, here);
}
}
- strncpy(there,here,126);
-
+ g_strlcpy(there, here, sizeof(there));
}
#endif
+static void
+emem_init_chunk(emem_pool_t *mem)
+{
+ if (mem->debug_use_canary)
+ emem_canary_init(mem->canary);
+
+ if (mem->debug_use_chunks)
+ mem->memory_alloc = emem_alloc_chunk;
+ else
+ mem->memory_alloc = emem_alloc_glib;
+}
+
+static gsize
+emem_memory_usage(const emem_pool_t *pool)
+{
+ gsize total_used = 0;
+ emem_chunk_t *chunk;
+
+ for (chunk = pool->used_list; chunk; chunk = chunk->next)
+ total_used += (chunk->amount_free_init - chunk->amount_free);
+
+ for (chunk = pool->free_list; chunk; chunk = chunk->next)
+ total_used += (chunk->amount_free_init - chunk->amount_free);
+
+ return total_used;
+}
+
+static gsize
+ep_memory_usage(void)
+{
+ return emem_memory_usage(&ep_packet_mem);
+}
/* Initialize the packet-lifetime memory allocation pool.
* This function should be called only once when Wireshark or TShark starts
* up.
*/
-void
+static void
ep_init_chunk(void)
{
+ static const ws_mem_usage_t ep_stats = { "EP", ep_memory_usage, NULL };
+
ep_packet_mem.free_list=NULL;
ep_packet_mem.used_list=NULL;
+ ep_packet_mem.trees=NULL; /* not used by this allocator */
- ep_debug_use_chunks = (gboolean) (!getenv("WIRESHARK_DEBUG_EP_NO_CHUNKS"));
- ep_debug_use_canary = (gboolean) (!getenv("WIRESHARK_DEBUG_EP_NO_CANARY"));
+ ep_packet_mem.debug_use_chunks = (getenv("WIRESHARK_DEBUG_EP_NO_CHUNKS") == NULL);
+ ep_packet_mem.debug_use_canary = ep_packet_mem.debug_use_chunks && (getenv("WIRESHARK_DEBUG_EP_NO_CANARY") == NULL);
+ ep_packet_mem.debug_verify_pointers = (getenv("WIRESHARK_EP_VERIFY_POINTERS") != NULL);
#ifdef DEBUG_INTENSE_CANARY_CHECKS
- intense_canary_checking = (gboolean)getenv("WIRESHARK_DEBUG_EP_INTENSE_CANARY");
+ intense_canary_checking = (getenv("WIRESHARK_DEBUG_EP_INTENSE_CANARY") != NULL);
#endif
- if (ep_debug_use_canary)
- emem_canary(ep_canary);
+ emem_init_chunk(&ep_packet_mem);
+
+ memory_usage_component_register(&ep_stats);
+}
+
+static gsize
+se_memory_usage(void)
+{
+ return emem_memory_usage(&se_packet_mem);
+}
+
+/* Initialize the capture-lifetime memory allocation pool.
+ * This function should be called only once when Wireshark or TShark starts
+ * up.
+ */
+static void
+se_init_chunk(void)
+{
+ static const ws_mem_usage_t se_stats = { "SE", se_memory_usage, NULL };
+
+ se_packet_mem.free_list = NULL;
+ se_packet_mem.used_list = NULL;
+ se_packet_mem.trees = NULL;
+
+ se_packet_mem.debug_use_chunks = (getenv("WIRESHARK_DEBUG_SE_NO_CHUNKS") == NULL);
+ se_packet_mem.debug_use_canary = se_packet_mem.debug_use_chunks && (getenv("WIRESHARK_DEBUG_SE_USE_CANARY") != NULL);
+ se_packet_mem.debug_verify_pointers = (getenv("WIRESHARK_SE_VERIFY_POINTERS") != NULL);
+
+ emem_init_chunk(&se_packet_mem);
+
+ memory_usage_component_register(&se_stats);
+}
+
+/* Initialize all the allocators here.
+ * This function should be called only once when Wireshark or TShark starts
+ * up.
+ */
+void
+emem_init(void)
+{
+ ep_init_chunk();
+ se_init_chunk();
+
+ if (getenv("WIRESHARK_DEBUG_SCRUB_MEMORY"))
+ debug_use_memory_scrubber = TRUE;
#if defined (_WIN32)
/* Set up our guard page info for Win32 */
GetSystemInfo(&sysinfo);
pagesize = sysinfo.dwPageSize;
+#if (_MSC_VER >= 1800)
+ /*
+ * On VS2103, GetVersionEx is deprecated. Microsoft recommend to
+ * use VerifyVersionInfo instead
+ */
+ {
+ OSVERSIONINFOEX osvi;
+ DWORDLONG dwlConditionMask = 0;
+ int op = VER_EQUAL;
+
+ SecureZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ osvi.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
+ VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
+ iswindowsplatform = VerifyVersionInfo(&osvi, VER_PLATFORMID, dwlConditionMask);
+ }
+#else
/* calling GetVersionEx using the OSVERSIONINFO structure.
* OSVERSIONINFOEX requires Win NT4 with SP6 or newer NT Versions.
* OSVERSIONINFOEX will fail on Win9x and older NT Versions.
* http://msdn.microsoft.com/library/en-us/sysinfo/base/osversioninfo_str.asp
* http://msdn.microsoft.com/library/en-us/sysinfo/base/osversioninfoex_str.asp
*/
- versinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&versinfo);
+ {
+ OSVERSIONINFO versinfo;
+
+ SecureZeroMemory(&versinfo, sizeof(OSVERSIONINFO));
+ versinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&versinfo);
+ iswindowsplatform = (versinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS);
+ }
+#endif
#elif defined(USE_GUARD_PAGES)
pagesize = sysconf(_SC_PAGESIZE);
+ if (pagesize == -1)
+ fprintf(stderr, "Warning: call to sysconf() for _SC_PAGESIZE has failed...\n");
#ifdef NEED_DEV_ZERO
dev_zero_fd = ws_open("/dev/zero", O_RDWR);
g_assert(dev_zero_fd != -1);
#endif /* _WIN32 / USE_GUARD_PAGES */
}
-/* Initialize the capture-lifetime memory allocation pool.
- * This function should be called only once when Wireshark or TShark starts
- * up.
- */
-void
-se_init_chunk(void)
-{
- se_packet_mem.free_list=NULL;
- se_packet_mem.used_list=NULL;
-
- se_debug_use_chunks = (gboolean) (!getenv("WIRESHARK_DEBUG_SE_NO_CHUNKS"));
- se_debug_use_canary = (gboolean) (getenv("WIRESHARK_DEBUG_SE_USE_CANARY"));
-
- if (se_debug_use_canary)
- emem_canary(se_canary);
-}
-
#ifdef SHOW_EMEM_STATS
-static guint allocations[10] = { 0 };
+#define NUM_ALLOC_DIST 10
+static guint allocations[NUM_ALLOC_DIST] = { 0 };
static guint total_no_chunks = 0;
static void
-print_alloc_stats()
+print_alloc_stats(void)
{
guint num_chunks = 0;
guint num_allocs = 0;
guint total_used = 0;
guint total_allocation = 0;
- guint total_free = 0;
guint used_for_canaries = 0;
- guint i_ctr, i;
+ guint total_headers;
+ guint i;
emem_chunk_t *chunk;
guint total_space_allocated_from_os, total_space_wasted;
gboolean ep_stat=TRUE;
- printf("\n-------- EP allocator statistics --------\n");
- printf("%s chunks, %s canaries\n",
- ep_debug_use_chunks ? "Using" : "Not using",
- ep_debug_use_canary ? "using" : "not using");
+ fprintf(stderr, "\n-------- EP allocator statistics --------\n");
+ fprintf(stderr, "%s chunks, %s canaries, %s memory scrubber\n",
+ ep_packet_mem.debug_use_chunks ? "Using" : "Not using",
+ ep_packet_mem.debug_use_canary ? "using" : "not using",
+ debug_use_memory_scrubber ? "using" : "not using");
if (! (ep_packet_mem.free_list || !ep_packet_mem.used_list)) {
- printf("No memory allocated\n");
+ fprintf(stderr, "No memory allocated\n");
ep_stat = FALSE;
}
- if ((ep_debug_use_chunks)&&(ep_stat)){
+ if (ep_packet_mem.debug_use_chunks && ep_stat) {
/* Nothing interesting without chunks */
- /* Only look at the used_list since those chunks are fully used.
- * Looking at the free list would skew our view.
+ /* Only look at the used_list since those chunks are fully
+ * used. Looking at the free list would skew our view of what
+ * we have wasted.
*/
for (chunk = ep_packet_mem.used_list; chunk; chunk = chunk->next) {
num_chunks++;
total_used += (chunk->amount_free_init - chunk->amount_free);
total_allocation += chunk->amount_free_init;
- total_free += chunk->amount_free;
}
if (num_chunks > 0) {
- printf ("\n");
- printf ("\n---- Buffer space ----\n");
- printf ("\tChunk allocation size: %10u\n", EMEM_PACKET_CHUNK_SIZE);
- printf ("\t* Number of chunks: %10u\n", num_chunks);
- printf ("\t-------------------------------------------\n");
- printf ("\t= %u (%u including guard pages) total space used for buffers\n",
+ fprintf (stderr, "\n");
+ fprintf (stderr, "\n---- Buffer space ----\n");
+ fprintf (stderr, "\tChunk allocation size: %10u\n", EMEM_PACKET_CHUNK_SIZE);
+ fprintf (stderr, "\t* Number of chunks: %10u\n", num_chunks);
+ fprintf (stderr, "\t-------------------------------------------\n");
+ fprintf (stderr, "\t= %u (%u including guard pages) total space used for buffers\n",
total_allocation, EMEM_PACKET_CHUNK_SIZE * num_chunks);
- printf ("\t-------------------------------------------\n");
+ fprintf (stderr, "\t-------------------------------------------\n");
total_space_allocated_from_os = total_allocation
- + (sizeof(emem_chunk_t) + sizeof(emem_canary_t)) * num_chunks;
- printf ("Total allocated from OS: %u\n\n",
+ + sizeof(emem_chunk_t) * num_chunks;
+ fprintf (stderr, "Total allocated from OS: %u\n\n",
total_space_allocated_from_os);
}else{
- printf ("No fully used chunks, nothing to do\n");
+ fprintf (stderr, "No fully used chunks, nothing to do\n");
}
/* Reset stats */
num_chunks = 0;
num_allocs = 0;
total_used = 0;
total_allocation = 0;
- total_free = 0;
used_for_canaries = 0;
}
- printf("\n-------- SE allocator statistics --------\n");
- printf("Total number of chunk allocations %u\n",
+ fprintf(stderr, "\n-------- SE allocator statistics --------\n");
+ fprintf(stderr, "Total number of chunk allocations %u\n",
total_no_chunks);
- printf("%s chunks, %s canaries\n",
- se_debug_use_chunks ? "Using" : "Not using",
- se_debug_use_canary ? "using" : "not using");
+ fprintf(stderr, "%s chunks, %s canaries\n",
+ se_packet_mem.debug_use_chunks ? "Using" : "Not using",
+ se_packet_mem.debug_use_canary ? "using" : "not using");
if (! (se_packet_mem.free_list || !se_packet_mem.used_list)) {
- printf("No memory allocated\n");
+ fprintf(stderr, "No memory allocated\n");
return;
}
- if (!se_debug_use_chunks )
- return; /* Nothing interesting without chunks & canaries?? */
+ if (!se_packet_mem.debug_use_chunks )
+ return; /* Nothing interesting without chunks?? */
/* Only look at the used_list since those chunks are fully used.
- * Looking at the free list would skew our view.
+ * Looking at the free list would skew our view of what we have wasted.
*/
for (chunk = se_packet_mem.used_list; chunk; chunk = chunk->next) {
num_chunks++;
total_used += (chunk->amount_free_init - chunk->amount_free);
total_allocation += chunk->amount_free_init;
- total_free += chunk->amount_free;
- if (se_debug_use_canary){
- num_allocs += chunk->canary_info->c_count;
- for (i_ctr = 0; i_ctr < chunk->canary_info->c_count; i_ctr++) {
- used_for_canaries += chunk->canary_info->cmp_len[i_ctr];
+ if (se_packet_mem.debug_use_canary){
+ void *ptr = chunk->canary_last;
+ int len;
+
+ while (ptr != NULL) {
+ ptr = emem_canary_next(se_packet_mem.canary, (guint8*)ptr, &len);
+
+ if (ptr == (void *) -1)
+ g_error("Memory corrupted");
+ used_for_canaries += len;
}
}
}
if (num_chunks == 0) {
- printf ("No fully used chunks, nothing to do\n");
- return;
- }
- if (!se_debug_use_canary){
- printf ("\n");
- printf ("\n---- Buffer space ----\n");
- printf ("\tChunk allocation size: %10u\n", EMEM_PACKET_CHUNK_SIZE);
- printf ("\t* Number of chunks: %10u\n", num_chunks);
- printf ("\t-------------------------------------------\n");
- printf ("\t= %u (%u including guard pages) total space used for buffers\n",
- total_allocation, EMEM_PACKET_CHUNK_SIZE * num_chunks);
- printf ("\t-------------------------------------------\n");
- total_space_allocated_from_os = total_allocation
- + (sizeof(emem_chunk_t) + sizeof(emem_canary_t)) * num_chunks;
- printf ("Total allocated from OS: %u\n\n",
- total_space_allocated_from_os);
- printf ("---------- Allocations from the SE pool ----------\n");
- printf (" Number of SE allocations: %10u\n", num_allocs);
- printf ("Bytes used (incl. canaries): %10u\n", total_used);
- printf (" Bytes used for canaries: %10u\n", used_for_canaries);
- printf (" Bytes unused (wasted): %10u\n\n",
- total_allocation - total_used);
- printf ("---------- Statistics ----------\n");
- printf ("\nAllocation distribution (sizes include canaries):\n");
- for (i = 0; i < 9; i++)
- printf ("size < %5d: %8u\n", 32<<i, allocations[i]);
- printf ("size > %5d: %8u\n", 32<<i, allocations[i]);
+ fprintf (stderr, "No fully used chunks, nothing to do\n");
return;
}
- printf ("\n");
- printf ("---------- Allocations from the OS ----------\n");
- printf ("---- Headers ----\n");
- printf ("\t( Chunk header size: %10lu\n", sizeof(emem_chunk_t));
- printf ("\t + Canary header size: %10lu)\n", sizeof(emem_canary_t));
- printf ("\t* Number of chunks: %10u\n", num_chunks);
- printf ("\t-------------------------------------------\n");
- printf ("\t= %lu total space used for headers\n",
- (sizeof(emem_chunk_t) + sizeof(emem_canary_t)) * num_chunks);
- printf ("\n---- Buffer space ----\n");
- printf ("\tChunk allocation size: %10u\n", EMEM_PACKET_CHUNK_SIZE);
- printf ("\t* Number of chunks: %10u\n", num_chunks);
- printf ("\t-------------------------------------------\n");
- printf ("\t= %u (%u including guard pages) total space used for buffers\n",
+ fprintf (stderr, "\n");
+ fprintf (stderr, "---------- Allocations from the OS ----------\n");
+ fprintf (stderr, "---- Headers ----\n");
+ fprintf (stderr, "\t( Chunk header size: %10lu\n",
+ sizeof(emem_chunk_t));
+ fprintf (stderr, "\t* Number of chunks: %10u\n", num_chunks);
+ fprintf (stderr, "\t-------------------------------------------\n");
+
+ total_headers = sizeof(emem_chunk_t) * num_chunks;
+ fprintf (stderr, "\t= %u bytes used for headers\n", total_headers);
+ fprintf (stderr, "\n---- Buffer space ----\n");
+ fprintf (stderr, "\tChunk allocation size: %10u\n",
+ EMEM_PACKET_CHUNK_SIZE);
+ fprintf (stderr, "\t* Number of chunks: %10u\n", num_chunks);
+ fprintf (stderr, "\t-------------------------------------------\n");
+ fprintf (stderr, "\t= %u (%u including guard pages) bytes used for buffers\n",
total_allocation, EMEM_PACKET_CHUNK_SIZE * num_chunks);
- printf ("\t-------------------------------------------\n");
- total_space_allocated_from_os = total_allocation
- + (sizeof(emem_chunk_t) + sizeof(emem_canary_t)) * num_chunks;
- printf ("Total allocated from OS: %u\n\n",
+ fprintf (stderr, "\t-------------------------------------------\n");
+ total_space_allocated_from_os = (EMEM_PACKET_CHUNK_SIZE * num_chunks)
+ + total_headers;
+ fprintf (stderr, "Total bytes allocated from the OS: %u\n\n",
total_space_allocated_from_os);
- printf ("---------- Allocations from the SE pool ----------\n");
- printf (" Number of SE allocations: %10u\n", num_allocs);
- printf ("Bytes used (incl. canaries): %10u\n", total_used);
- printf (" Bytes used for canaries: %10u\n", used_for_canaries);
- printf (" Bytes unused (wasted): %10u\n\n",
- total_allocation - total_used);
-
- printf ("---------- Statistics ----------\n");
- printf ("Average SE allocation size (incl. canaries): %6.2f\n",
+ for (i = 0; i < NUM_ALLOC_DIST; i++)
+ num_allocs += allocations[i];
+
+ fprintf (stderr, "---------- Allocations from the SE pool ----------\n");
+ fprintf (stderr, " Number of SE allocations: %10u\n",
+ num_allocs);
+ fprintf (stderr, " Bytes used (incl. canaries): %10u\n",
+ total_used);
+ fprintf (stderr, " Bytes used for canaries: %10u\n",
+ used_for_canaries);
+ fprintf (stderr, "Bytes unused (wasted, excl. guard pages): %10u\n",
+ total_allocation - total_used);
+ fprintf (stderr, "Bytes unused (wasted, incl. guard pages): %10u\n\n",
+ total_space_allocated_from_os - total_used);
+
+ fprintf (stderr, "---------- Statistics ----------\n");
+ fprintf (stderr, "Average SE allocation size (incl. canaries): %6.2f\n",
(float)total_used/(float)num_allocs);
- printf ("Average SE allocation size (excl. canaries): %6.2f\n",
+ fprintf (stderr, "Average SE allocation size (excl. canaries): %6.2f\n",
(float)(total_used - used_for_canaries)/(float)num_allocs);
- printf (" Average wasted bytes per allocation: %6.2f\n",
+ fprintf (stderr, " Average wasted bytes per allocation: %6.2f\n",
(total_allocation - total_used)/(float)num_allocs);
total_space_wasted = (total_allocation - total_used)
- + (sizeof(emem_chunk_t) + sizeof(emem_canary_t));
- printf (" Space used for headers + unused allocation: %8u\n",
+ + (sizeof(emem_chunk_t));
+ fprintf (stderr, " Space used for headers + unused allocation: %8u\n",
total_space_wasted);
- printf ("--> %% overhead/waste: %4.2f\n",
+ fprintf (stderr, "--> %% overhead/waste: %4.2f\n",
100 * (float)total_space_wasted/(float)total_space_allocated_from_os);
- printf ("\nAllocation distribution (sizes include canaries):\n");
- for (i = 0; i < 9; i++)
- printf ("size < %5d: %8u\n", 32<<i, allocations[i]);
- printf ("size > %5d: %8u\n", 32<<i, allocations[i]);
+ fprintf (stderr, "\nAllocation distribution (sizes include canaries):\n");
+ for (i = 0; i < (NUM_ALLOC_DIST-1); i++)
+ fprintf (stderr, "size < %5d: %8u\n", 32<<i, allocations[i]);
+ fprintf (stderr, "size > %5d: %8u\n", 32<<i, allocations[i]);
}
#endif
static gboolean
-emem_verify_pointer(emem_header_t *hdr, const void *ptr)
+emem_verify_pointer_list(const emem_chunk_t *chunk_list, const void *ptr)
{
- const gchar *cptr = ptr;
- emem_chunk_t *used_list[2];
- guint8 used_list_idx;
- emem_chunk_t *chunk;
+ const gchar *cptr = (const gchar *)ptr;
+ const emem_chunk_t *chunk;
- used_list[0] = hdr->free_list;
- used_list[1] = hdr->used_list;
-
- for (used_list_idx=0; used_list_idx < G_N_ELEMENTS(used_list); ++used_list_idx) {
- chunk = used_list[used_list_idx];
- for ( ; chunk ; chunk = chunk->next) {
- if (cptr >= (chunk->buf + chunk->free_offset_init) &&
- cptr < (chunk->buf + chunk->free_offset))
- return TRUE;
- }
+ for (chunk = chunk_list; chunk; chunk = chunk->next) {
+ if (cptr >= (chunk->buf + chunk->free_offset_init) && cptr < (chunk->buf + chunk->free_offset))
+ return TRUE;
}
-
return FALSE;
}
+static gboolean
+emem_verify_pointer(const emem_pool_t *hdr, const void *ptr)
+{
+ return emem_verify_pointer_list(hdr->free_list, ptr) || emem_verify_pointer_list(hdr->used_list, ptr);
+}
+
gboolean
ep_verify_pointer(const void *ptr)
{
- return emem_verify_pointer(&ep_packet_mem, ptr);
+ if (ep_packet_mem.debug_verify_pointers)
+ return emem_verify_pointer(&ep_packet_mem, ptr);
+ else
+ return FALSE;
}
gboolean
se_verify_pointer(const void *ptr)
{
- return emem_verify_pointer(&se_packet_mem, ptr);
+ if (se_packet_mem.debug_verify_pointers)
+ return emem_verify_pointer(&se_packet_mem, ptr);
+ else
+ return FALSE;
}
static void
-emem_create_chunk(emem_chunk_t **free_list, gboolean use_canary) {
-#if defined (_WIN32)
- BOOL ret;
- char *buf_end, *prot1, *prot2;
- DWORD oldprot;
-#elif defined(USE_GUARD_PAGES)
- int ret;
- char *buf_end, *prot1, *prot2;
-#endif /* _WIN32 / USE_GUARD_PAGES */
- emem_chunk_t *npc;
+emem_scrub_memory(char *buf, size_t size, gboolean alloc)
+{
+ guint scrubbed_value;
+ size_t offset;
+
+ if (!debug_use_memory_scrubber)
+ return;
+
+ if (alloc) /* this memory is being allocated */
+ scrubbed_value = 0xBADDCAFE;
+ else /* this memory is being freed */
+ scrubbed_value = 0xDEADBEEF;
+
+ /* We shouldn't need to check the alignment of the starting address
+ * since this is malloc'd memory (or 'pagesize' bytes into malloc'd
+ * memory).
+ */
+
+ /* XXX - if the above is *NOT* true, we should use memcpy here,
+ * in order to avoid problems on alignment-sensitive platforms, e.g.
+ * http://stackoverflow.com/questions/108866/is-there-memset-that-accepts-integers-larger-than-char
+ */
+
+ for (offset = 0; offset + sizeof(guint) <= size; offset += sizeof(guint))
+ *(guint*)(void*)(buf+offset) = scrubbed_value;
+
+ /* Initialize the last bytes, if any */
+ if (offset < size) {
+ *(guint8*)(buf+offset) = scrubbed_value >> 24;
+ offset++;
+ if (offset < size) {
+ *(guint8*)(buf+offset) = (scrubbed_value >> 16) & 0xFF;
+ offset++;
+ if (offset < size) {
+ *(guint8*)(buf+offset) = (scrubbed_value >> 8) & 0xFF;
+ }
+ }
+ }
- /* we dont have any free data, so we must allocate a new one */
- DISSECTOR_ASSERT(!*free_list);
+
+}
+
+static emem_chunk_t *
+emem_create_chunk(size_t size)
+{
+ emem_chunk_t *npc;
npc = g_new(emem_chunk_t, 1);
npc->next = NULL;
- if (use_canary) {
- npc->canary_info = g_new(emem_canary_t, 1);
- npc->canary_info->c_count = 0;
- }
- else
- npc->canary_info = NULL;
+ npc->canary_last = NULL;
- *free_list = npc;
#if defined (_WIN32)
/*
* MSDN documents VirtualAlloc/VirtualProtect at
*/
/* XXX - is MEM_COMMIT|MEM_RESERVE correct? */
- npc->buf = VirtualAlloc(NULL, EMEM_PACKET_CHUNK_SIZE,
+ npc->buf = (char *)VirtualAlloc(NULL, size,
MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
- if(npc->buf == NULL) {
- THROW(OutOfMemoryError);
+
+ if (npc->buf == NULL) {
+ g_free(npc);
+ if (getenv("WIRESHARK_ABORT_ON_OUT_OF_MEMORY"))
+ abort();
+ else
+ THROW(OutOfMemoryError);
}
+
+#elif defined(USE_GUARD_PAGES)
+ npc->buf = (char *)mmap(NULL, size,
+ PROT_READ|PROT_WRITE, ANON_PAGE_MODE, ANON_FD, 0);
+
+ if (npc->buf == MAP_FAILED) {
+ g_free(npc);
+ if (getenv("WIRESHARK_ABORT_ON_OUT_OF_MEMORY"))
+ abort();
+ else
+ THROW(OutOfMemoryError);
+ }
+
+#else /* Is there a draft in here? */
+ npc->buf = g_malloc(size);
+ /* g_malloc() can't fail */
+#endif
+
#ifdef SHOW_EMEM_STATS
total_no_chunks++;
#endif
- buf_end = npc->buf + EMEM_PACKET_CHUNK_SIZE;
+
+ npc->amount_free = npc->amount_free_init = (unsigned int) size;
+ npc->free_offset = npc->free_offset_init = 0;
+ return npc;
+}
+
+static emem_chunk_t *
+emem_create_chunk_gp(size_t size)
+{
+#if defined (_WIN32)
+ BOOL ret;
+ char *buf_end, *prot1, *prot2;
+ DWORD oldprot;
+#elif defined(USE_GUARD_PAGES)
+ int ret;
+ char *buf_end, *prot1, *prot2;
+#endif /* _WIN32 / USE_GUARD_PAGES */
+ emem_chunk_t *npc;
+
+ npc = emem_create_chunk(size);
+
+#if defined (_WIN32)
+ buf_end = npc->buf + size;
/* Align our guard pages on page-sized boundaries */
- prot1 = (char *) ((((int) npc->buf + pagesize - 1) / pagesize) * pagesize);
- prot2 = (char *) ((((int) buf_end - (1 * pagesize)) / pagesize) * pagesize);
+ prot1 = (char *) ((((intptr_t) npc->buf + pagesize - 1) / pagesize) * pagesize);
+ prot2 = (char *) ((((intptr_t) buf_end - (1 * pagesize)) / pagesize) * pagesize);
ret = VirtualProtect(prot1, pagesize, PAGE_NOACCESS, &oldprot);
- g_assert(ret != 0 || versinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS);
+ g_assert(ret != 0 || iswindowsplatform);
ret = VirtualProtect(prot2, pagesize, PAGE_NOACCESS, &oldprot);
- g_assert(ret != 0 || versinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS);
+ g_assert(ret != 0 || iswindowsplatform);
npc->amount_free_init = (unsigned int) (prot2 - prot1 - pagesize);
- npc->amount_free = npc->amount_free_init;
npc->free_offset_init = (unsigned int) (prot1 - npc->buf) + pagesize;
- npc->free_offset = npc->free_offset_init;
-
#elif defined(USE_GUARD_PAGES)
- npc->buf = mmap(NULL, EMEM_PACKET_CHUNK_SIZE,
- PROT_READ|PROT_WRITE, ANON_PAGE_MODE, ANON_FD, 0);
- if(npc->buf == MAP_FAILED) {
- /* XXX - what do we have to cleanup here? */
- THROW(OutOfMemoryError);
- }
- buf_end = npc->buf + EMEM_PACKET_CHUNK_SIZE;
-#ifdef SHOW_EMEM_STATS
- total_no_chunks++;
-#endif
+ buf_end = npc->buf + size;
+
/* Align our guard pages on page-sized boundaries */
prot1 = (char *) ((((intptr_t) npc->buf + pagesize - 1) / pagesize) * pagesize);
prot2 = (char *) ((((intptr_t) buf_end - (1 * pagesize)) / pagesize) * pagesize);
+
ret = mprotect(prot1, pagesize, PROT_NONE);
g_assert(ret != -1);
ret = mprotect(prot2, pagesize, PROT_NONE);
g_assert(ret != -1);
- npc->amount_free_init = prot2 - prot1 - pagesize;
- npc->amount_free = npc->amount_free_init;
- npc->free_offset_init = (prot1 - npc->buf) + pagesize;
- npc->free_offset = npc->free_offset_init;
+ npc->amount_free_init = (unsigned int)(prot2 - prot1 - pagesize);
+ npc->free_offset_init = (unsigned int)((prot1 - npc->buf) + pagesize);
+#else
+ npc->amount_free_init = size;
+ npc->free_offset_init = 0;
+#endif /* USE_GUARD_PAGES */
-#else /* Is there a draft in here? */
- npc->buf = g_malloc(EMEM_PACKET_CHUNK_SIZE);
- if(npc->buf == NULL) {
- THROW(OutOfMemoryError);
- }
-#ifdef SHOW_EMEM_STATS
- total_no_chunks++;
-#endif
- npc->amount_free_init = EMEM_PACKET_CHUNK_SIZE;
npc->amount_free = npc->amount_free_init;
- npc->free_offset_init = 0;
npc->free_offset = npc->free_offset_init;
-#endif /* USE_GUARD_PAGES */
+ return npc;
}
-/* allocate 'size' amount of memory. */
static void *
-emem_alloc(size_t size, emem_header_t *mem, gboolean use_chunks, guint8 *canary)
+emem_alloc_chunk(size_t size, emem_pool_t *mem)
{
void *buf;
- void *cptr;
+
+ size_t asize = size;
+ gboolean use_canary = mem->debug_use_canary;
guint8 pad;
emem_chunk_t *free_list;
- if (use_chunks) {
- gboolean use_canary = canary != NULL;
- /* Round up to an 8 byte boundary. Make sure we have at least
- * 8 pad bytes for our canary.
- */
- if (use_canary)
- pad = emem_canary_pad(size);
- else
- pad = ((8 - (size & 0x7)) & 0x7);
+ /* Allocate room for at least 8 bytes of canary plus some padding
+ * so the canary ends on an 8-byte boundary.
+ * But first add the room needed for the pointer to the next canary
+ * (so the entire allocation will end on an 8-byte boundary).
+ */
+ if (use_canary) {
+ asize += sizeof(void *);
+ pad = emem_canary_pad(asize);
+ } else
+ pad = (WS_MEM_ALIGN - (asize & (WS_MEM_ALIGN-1))) & (WS_MEM_ALIGN-1);
- size += pad;
+ asize += pad;
#ifdef SHOW_EMEM_STATS
- /* Do this check here so we can include the canary size */
- if (mem == &se_packet_mem) {
- if (size < 32)
- allocations[0]++;
- else if (size < 64)
- allocations[1]++;
- else if (size < 128)
- allocations[2]++;
- else if (size < 256)
- allocations[3]++;
- else if (size < 512)
- allocations[4]++;
- else if (size < 1024)
- allocations[5]++;
- else if (size < 2048)
- allocations[6]++;
- else if (size < 4096)
- allocations[7]++;
- else if (size < 8192)
- allocations[8]++;
- else if (size < 16384)
- allocations[8]++;
- else
- allocations[9]++;
- }
+ /* Do this check here so we can include the canary size */
+ if (mem == &se_packet_mem) {
+ if (asize < 32)
+ allocations[0]++;
+ else if (asize < 64)
+ allocations[1]++;
+ else if (asize < 128)
+ allocations[2]++;
+ else if (asize < 256)
+ allocations[3]++;
+ else if (asize < 512)
+ allocations[4]++;
+ else if (asize < 1024)
+ allocations[5]++;
+ else if (asize < 2048)
+ allocations[6]++;
+ else if (asize < 4096)
+ allocations[7]++;
+ else if (asize < 8192)
+ allocations[8]++;
+ else if (asize < 16384)
+ allocations[8]++;
+ else
+ allocations[(NUM_ALLOC_DIST-1)]++;
+ }
#endif
- /* make sure we dont try to allocate too much (arbitrary limit) */
- DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2));
+ /* make sure we dont try to allocate too much (arbitrary limit) */
+ DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2));
- if (!mem->free_list)
- emem_create_chunk(&mem->free_list, use_canary);
+ if (!mem->free_list)
+ mem->free_list = emem_create_chunk_gp(EMEM_PACKET_CHUNK_SIZE);
- /* oops, we need to allocate more memory to serve this request
- * than we have free. move this node to the used list and try again
- */
- if(size > mem->free_list->amount_free ||
- (use_canary &&
- mem->free_list->canary_info->c_count >= EMEM_ALLOCS_PER_CHUNK)) {
- emem_chunk_t *npc;
- npc=mem->free_list;
- mem->free_list=mem->free_list->next;
- npc->next=mem->used_list;
- mem->used_list=npc;
- }
+ /* oops, we need to allocate more memory to serve this request
+ * than we have free. move this node to the used list and try again
+ */
+ if(asize > mem->free_list->amount_free) {
+ emem_chunk_t *npc;
+ npc=mem->free_list;
+ mem->free_list=mem->free_list->next;
+ npc->next=mem->used_list;
+ mem->used_list=npc;
if (!mem->free_list)
- emem_create_chunk(&mem->free_list, use_canary);
+ mem->free_list = emem_create_chunk_gp(EMEM_PACKET_CHUNK_SIZE);
+ }
- free_list = mem->free_list;
+ free_list = mem->free_list;
- buf = free_list->buf + free_list->free_offset;
+ buf = free_list->buf + free_list->free_offset;
- free_list->amount_free -= (unsigned int) size;
- free_list->free_offset += (unsigned int) size;
+ free_list->amount_free -= (unsigned int) asize;
+ free_list->free_offset += (unsigned int) asize;
- if (use_canary) {
- cptr = (char *)buf + size - pad;
- memcpy(cptr, canary, pad);
- free_list->canary_info->canary[free_list->canary_info->c_count] = cptr;
- free_list->canary_info->cmp_len[free_list->canary_info->c_count] = pad;
- free_list->canary_info->c_count++;
- }
- } else {
- emem_chunk_t *npc;
+ if (use_canary) {
+ char *cptr = (char *)buf + size;
- npc=g_new(emem_chunk_t, 1);
- npc->next=mem->used_list;
- npc->buf=g_malloc(size);
- npc->canary_info = NULL;
- buf = npc->buf;
- mem->used_list=npc;
- /* There's no padding/alignment involved (from our point of view) when
- * we fetch the memory directly from the system pool, so WYSIWYG */
- npc->free_offset = npc->free_offset_init = 0;
- npc->amount_free = npc->amount_free_init = (unsigned int) size;
+ memcpy(cptr, mem->canary, pad-1);
+ cptr[pad-1] = '\0';
+ memcpy(cptr + pad, &free_list->canary_last, sizeof(void *));
+
+ free_list->canary_last = cptr;
}
return buf;
}
+static void *
+emem_alloc_glib(size_t size, emem_pool_t *mem)
+{
+ emem_chunk_t *npc;
+
+ npc=g_new(emem_chunk_t, 1);
+ npc->next=mem->used_list;
+ npc->buf=(char *)g_malloc(size);
+ npc->canary_last = NULL;
+ mem->used_list=npc;
+ /* There's no padding/alignment involved (from our point of view) when
+ * we fetch the memory directly from the system pool, so WYSIWYG */
+ npc->amount_free = npc->free_offset_init = 0;
+ npc->free_offset = npc->amount_free_init = (unsigned int) size;
+
+ return npc->buf;
+}
+
+/* allocate 'size' amount of memory. */
+static void *
+emem_alloc(size_t size, emem_pool_t *mem)
+{
+ void *buf;
+
+#if 0
+ /* For testing wmem, effectively redirects most emem memory to wmem.
+ * You will also have to comment out several assertions in wmem_core.c,
+ * specifically anything g_assert(allocator->in_scope), since it is much
+ * stricter about when it is permitted to be called. */
+ if (mem == &ep_packet_mem) {
+ return wmem_alloc(wmem_packet_scope(), size);
+ }
+ else if (mem == &se_packet_mem) {
+ return wmem_alloc(wmem_file_scope(), size);
+ }
+#endif
+
+ buf = mem->memory_alloc(size, mem);
+
+ /* XXX - this is a waste of time if the allocator function is going to
+ * memset this straight back to 0.
+ */
+ emem_scrub_memory((char *)buf, size, TRUE);
+
+ return buf;
+}
+
/* allocate 'size' amount of memory with an allocation lifetime until the
* next packet.
*/
void *
ep_alloc(size_t size)
{
- if (ep_debug_use_chunks)
- if (ep_debug_use_canary)
- return emem_alloc(size, &ep_packet_mem, TRUE, ep_canary);
- else
- return emem_alloc(size, &ep_packet_mem, TRUE, NULL);
- else
- return emem_alloc(size, &ep_packet_mem, FALSE, NULL);
+ return emem_alloc(size, &ep_packet_mem);
}
/* allocate 'size' amount of memory with an allocation lifetime until the
void *
se_alloc(size_t size)
{
- if (se_debug_use_chunks)
- if (se_debug_use_canary)
- return emem_alloc(size, &se_packet_mem, TRUE, se_canary);
- else
- return emem_alloc(size, &se_packet_mem, TRUE, NULL);
- else
- return emem_alloc(size, &se_packet_mem, FALSE, NULL);
+ return emem_alloc(size, &se_packet_mem);
}
-void* ep_alloc0(size_t size) {
+void *
+ep_alloc0(size_t size)
+{
return memset(ep_alloc(size),'\0',size);
}
-gchar* ep_strdup(const gchar* src) {
- guint len = (guint) strlen(src);
- gchar* dst;
+void *
+se_alloc0(size_t size)
+{
+ return memset(se_alloc(size),'\0',size);
+}
+
+static gchar *
+emem_strdup(const gchar *src, void *allocator(size_t))
+{
+ guint len;
+ gchar *dst;
- dst = strncpy(ep_alloc(len+1), src, len);
+ /* If str is NULL, just return the string "<NULL>" so that the callers don't
+ * have to bother checking it.
+ */
+ if(!src)
+ src = "<NULL>";
- dst[len] = '\0';
+ len = (guint) strlen(src);
+ dst = (gchar *)memcpy(allocator(len+1), src, len+1);
return dst;
}
-gchar* ep_strndup(const gchar* src, size_t len) {
- gchar* dst = ep_alloc(len+1);
+gchar *
+ep_strdup(const gchar *src)
+{
+ return emem_strdup(src, ep_alloc);
+}
+
+gchar *
+se_strdup(const gchar *src)
+{
+ return emem_strdup(src, se_alloc);
+}
+
+static gchar *
+emem_strndup(const gchar *src, size_t len, void *allocator(size_t))
+{
+ gchar *dst = (gchar *)allocator(len+1);
guint i;
for (i = 0; (i < len) && src[i]; i++)
return dst;
}
-void* ep_memdup(const void* src, size_t len) {
+gchar *
+ep_strndup(const gchar *src, size_t len)
+{
+ return emem_strndup(src, len, ep_alloc);
+}
+
+gchar *
+se_strndup(const gchar *src, size_t len)
+{
+ return emem_strndup(src, len, se_alloc);
+}
+
+
+
+void *
+ep_memdup(const void* src, size_t len)
+{
return memcpy(ep_alloc(len), src, len);
}
-gchar* ep_strdup_vprintf(const gchar* fmt, va_list ap) {
+void *
+se_memdup(const void* src, size_t len)
+{
+ return memcpy(se_alloc(len), src, len);
+}
+
+static gchar *
+emem_strdup_vprintf(const gchar *fmt, va_list ap, void *allocator(size_t))
+{
va_list ap2;
gsize len;
gchar* dst;
len = g_printf_string_upper_bound(fmt, ap);
- dst = ep_alloc(len+1);
+ dst = (gchar *)allocator(len+1);
g_vsnprintf (dst, (gulong) len, fmt, ap2);
va_end(ap2);
return dst;
}
-gchar* ep_strdup_printf(const gchar* fmt, ...) {
+gchar *
+ep_strdup_vprintf(const gchar *fmt, va_list ap)
+{
+ return emem_strdup_vprintf(fmt, ap, ep_alloc);
+}
+
+gchar *
+se_strdup_vprintf(const gchar* fmt, va_list ap)
+{
+ return emem_strdup_vprintf(fmt, ap, se_alloc);
+}
+
+gchar *
+ep_strdup_printf(const gchar *fmt, ...)
+{
va_list ap;
- gchar* dst;
+ gchar *dst;
- va_start(ap,fmt);
+ va_start(ap, fmt);
dst = ep_strdup_vprintf(fmt, ap);
va_end(ap);
return dst;
}
-gchar** ep_strsplit(const gchar* string, const gchar* sep, int max_tokens) {
+gchar *
+se_strdup_printf(const gchar *fmt, ...)
+{
+ va_list ap;
+ gchar *dst;
+
+ va_start(ap, fmt);
+ dst = se_strdup_vprintf(fmt, ap);
+ va_end(ap);
+ return dst;
+}
+
+gchar **
+ep_strsplit(const gchar* string, const gchar* sep, int max_tokens)
+{
gchar* splitted;
gchar* s;
guint tokens;
return vec;
}
+gchar *
+ep_strconcat(const gchar *string1, ...)
+{
+ gsize l;
+ va_list args;
+ gchar *s;
+ gchar *concat;
+ gchar *ptr;
+ if (!string1)
+ return NULL;
-void* se_alloc0(size_t size) {
- return memset(se_alloc(size),'\0',size);
-}
-
-/* If str is NULL, just return the string "<NULL>" so that the callers dont
- * have to bother checking it.
- */
-gchar* se_strdup(const gchar* src) {
- guint len;
- gchar* dst;
-
- if(!src){
- return "<NULL>";
+ l = 1 + strlen(string1);
+ va_start(args, string1);
+ s = va_arg(args, gchar*);
+ while (s) {
+ l += strlen(s);
+ s = va_arg(args, gchar*);
}
+ va_end(args);
- len = (guint) strlen(src);
- dst = strncpy(se_alloc(len+1), src, len);
-
- dst[len] = '\0';
-
- return dst;
-}
-
-gchar* se_strndup(const gchar* src, size_t len) {
- gchar* dst = se_alloc(len+1);
- guint i;
-
- for (i = 0; (i < len) && src[i]; i++)
- dst[i] = src[i];
-
- dst[i] = '\0';
-
- return dst;
-}
-
-void* se_memdup(const void* src, size_t len) {
- return memcpy(se_alloc(len), src, len);
-}
-
-gchar* se_strdup_vprintf(const gchar* fmt, va_list ap) {
- va_list ap2;
- gsize len;
- gchar* dst;
-
- G_VA_COPY(ap2, ap);
+ concat = (gchar *)ep_alloc(l);
+ ptr = concat;
- len = g_printf_string_upper_bound(fmt, ap);
-
- dst = se_alloc(len+1);
- g_vsnprintf (dst, (gulong) len, fmt, ap2);
- va_end(ap2);
+ ptr = g_stpcpy(ptr, string1);
+ va_start(args, string1);
+ s = va_arg(args, gchar*);
+ while (s) {
+ ptr = g_stpcpy(ptr, s);
+ s = va_arg(args, gchar*);
+ }
+ va_end(args);
- return dst;
+ return concat;
}
-gchar* se_strdup_printf(const gchar* fmt, ...) {
- va_list ap;
- gchar* dst;
- va_start(ap,fmt);
- dst = se_strdup_vprintf(fmt, ap);
- va_end(ap);
- return dst;
-}
/* release all allocated memory back to the pool. */
static void
-emem_free_all(emem_header_t *mem, gboolean use_chunks, guint8 *canary, emem_tree_t *trees)
+emem_free_all(emem_pool_t *mem)
{
+ gboolean use_chunks = mem->debug_use_chunks;
+
emem_chunk_t *npc;
emem_tree_t *tree_list;
- guint i;
/* move all used chunks over to the free list */
while(mem->used_list){
npc = mem->free_list;
while (npc != NULL) {
if (use_chunks) {
- if (canary) {
- for (i = 0; i < npc->canary_info->c_count; i++) {
- if (memcmp(npc->canary_info->canary[i], canary, npc->canary_info->cmp_len[i]) != 0)
- g_error("Memory corrupted");
- }
- npc->canary_info->c_count = 0;
+ while (npc->canary_last != NULL) {
+ npc->canary_last = emem_canary_next(mem->canary, (guint8 *)npc->canary_last, NULL);
+ /* XXX, check if canary_last is inside allocated memory? */
+
+ if (npc->canary_last == (void *) -1)
+ g_error("Memory corrupted");
}
+
+ emem_scrub_memory((npc->buf + npc->free_offset_init),
+ (npc->free_offset - npc->free_offset_init),
+ FALSE);
+
npc->amount_free = npc->amount_free_init;
npc->free_offset = npc->free_offset_init;
npc = npc->next;
} else {
emem_chunk_t *next = npc->next;
+ emem_scrub_memory(npc->buf, npc->amount_free_init, FALSE);
+
g_free(npc->buf);
g_free(npc);
npc = next;
}
}
+ if (!use_chunks) {
+ /* We've freed all this memory already */
+ mem->free_list = NULL;
+ }
+
/* release/reset all allocated trees */
- for(tree_list=trees;tree_list;tree_list=tree_list->next){
+ for(tree_list=mem->trees;tree_list;tree_list=tree_list->next){
tree_list->tree=NULL;
}
}
void
ep_free_all(void)
{
- if (ep_debug_use_chunks)
- if (ep_debug_use_canary)
- emem_free_all(&ep_packet_mem, TRUE, ep_canary, NULL /* trees */);
- else
- emem_free_all(&ep_packet_mem, TRUE, NULL, NULL /* trees */);
- else
- emem_free_all(&ep_packet_mem, FALSE, NULL, NULL /* trees */);
-
- if (!ep_debug_use_chunks)
- ep_init_chunk();
+ emem_free_all(&ep_packet_mem);
}
-/* routines to manage se allocated red-black trees */
-static emem_tree_t *se_trees=NULL;
-
/* release all allocated memory back to the pool. */
void
se_free_all(void)
{
-
#ifdef SHOW_EMEM_STATS
print_alloc_stats();
#endif
- if (se_debug_use_chunks)
- if (se_debug_use_canary)
- emem_free_all(&se_packet_mem, TRUE, se_canary, se_trees);
- else
- emem_free_all(&se_packet_mem, TRUE, NULL, se_trees);
- else
- emem_free_all(&se_packet_mem, FALSE, NULL, se_trees);
-
- if (!se_debug_use_chunks)
- se_init_chunk();
-}
-
-ep_stack_t ep_stack_new(void) {
- ep_stack_t s = ep_new(struct _ep_stack_frame_t*);
- *s = ep_new0(struct _ep_stack_frame_t);
- return s;
-}
-
-/* for ep_stack_t we'll keep the popped frames so we reuse them instead
-of allocating new ones.
-*/
-
-
-void* ep_stack_push(ep_stack_t stack, void* data) {
- struct _ep_stack_frame_t* frame;
- struct _ep_stack_frame_t* head = (*stack);
-
- if (head->above) {
- frame = head->above;
- } else {
- frame = ep_new(struct _ep_stack_frame_t);
- head->above = frame;
- frame->below = head;
- frame->above = NULL;
- }
-
- frame->payload = data;
- (*stack) = frame;
-
- return data;
-}
-
-void* ep_stack_pop(ep_stack_t stack) {
-
- if ((*stack)->below) {
- (*stack) = (*stack)->below;
- return (*stack)->above->payload;
- } else {
- return NULL;
- }
+ emem_free_all(&se_packet_mem);
}
emem_tree_t *
se_tree_create(int type, const char *name)
{
emem_tree_t *tree_list;
-
- tree_list=g_malloc(sizeof(emem_tree_t));
- tree_list->next=se_trees;
- tree_list->type=type;
- tree_list->tree=NULL;
- tree_list->name=name;
- tree_list->malloc=se_alloc;
- se_trees=tree_list;
-
- return tree_list;
-}
-
-void *
-emem_tree_lookup32(emem_tree_t *se_tree, guint32 key)
-{
- emem_tree_node_t *node;
-
- node=se_tree->tree;
-
- while(node){
- if(key==node->key32){
- return node->data;
- }
- if(key<node->key32){
- node=node->left;
- continue;
- }
- if(key>node->key32){
- node=node->right;
- continue;
- }
- }
- return NULL;
+
+ tree_list=(emem_tree_t *)g_malloc(sizeof(emem_tree_t));
+ tree_list->next=se_packet_mem.trees;
+ tree_list->type=type;
+ tree_list->tree=NULL;
+ tree_list->name=name;
+ tree_list->malloc=se_alloc;
+ se_packet_mem.trees=tree_list;
+
+ return tree_list;
}
void *
-emem_tree_lookup32_le(emem_tree_t *se_tree, guint32 key)
+emem_tree_lookup32(emem_tree_t *se_tree, guint32 key)
{
emem_tree_node_t *node;
node=se_tree->tree;
- if(!node){
- return NULL;
- }
-
-
while(node){
if(key==node->key32){
return node->data;
}
if(key<node->key32){
- if(node->left){
- node=node->left;
- continue;
- } else {
- break;
- }
- }
- if(key>node->key32){
- if(node->right){
- node=node->right;
- continue;
- } else {
- break;
- }
- }
- }
-
-
- if(!node){
- return NULL;
- }
-
- /* If we are still at the root of the tree this means that this node
- * is either smaller than the search key and then we return this
- * node or else there is no smaller key available and then
- * we return NULL.
- */
- if(!node->parent){
- if(key>node->key32){
- return node->data;
- } else {
- return NULL;
+ node=node->left;
+ continue;
}
- }
-
- if(node->parent->left==node){
- /* left child */
-
if(key>node->key32){
- /* if this is a left child and its key is smaller than
- * the search key, then this is the node we want.
- */
- return node->data;
- } else {
- /* if this is a left child and its key is bigger than
- * the search key, we have to check if any
- * of our ancestors are smaller than the search key.
- */
- while(node){
- if(key>node->key32){
- return node->data;
- }
- node=node->parent;
- }
- return NULL;
- }
- } else {
- /* right child */
-
- if(node->key32<key){
- /* if this is the right child and its key is smaller
- * than the search key then this is the one we want.
- */
- return node->data;
- } else {
- /* if this is the right child and its key is larger
- * than the search key then our parent is the one we
- * want.
- */
- return node->parent->data;
+ node=node->right;
+ continue;
}
}
-
+ return NULL;
}
-
static inline emem_tree_node_t *
emem_tree_parent(emem_tree_node_t *node)
{
}
return NULL;
}
+
static inline emem_tree_node_t *
emem_tree_uncle(emem_tree_node_t *node)
{
/* is this the first node ?*/
if(!node){
- node=se_tree->malloc(sizeof(emem_tree_node_t));
+ node=(emem_tree_node_t *)se_tree->malloc(sizeof(emem_tree_node_t));
switch(se_tree->type){
case EMEM_TREE_TYPE_RED_BLACK:
node->u.rb_color=EMEM_TREE_RB_COLOR_BLACK;
if(!node->left){
/* new node to the left */
emem_tree_node_t *new_node;
- new_node=se_tree->malloc(sizeof(emem_tree_node_t));
+ new_node=(emem_tree_node_t *)se_tree->malloc(sizeof(emem_tree_node_t));
node->left=new_node;
new_node->parent=node;
new_node->left=NULL;
if(!node->right){
/* new node to the right */
emem_tree_node_t *new_node;
- new_node=se_tree->malloc(sizeof(emem_tree_node_t));
+ new_node=(emem_tree_node_t *)se_tree->malloc(sizeof(emem_tree_node_t));
node->right=new_node;
new_node->parent=node;
new_node->left=NULL;
}
}
-static void* lookup_or_insert32(emem_tree_t *se_tree, guint32 key, void*(*func)(void*),void* ud, int is_subtree) {
- emem_tree_node_t *node;
-
- node=se_tree->tree;
-
- /* is this the first node ?*/
- if(!node){
- node=se_tree->malloc(sizeof(emem_tree_node_t));
- switch(se_tree->type){
- case EMEM_TREE_TYPE_RED_BLACK:
- node->u.rb_color=EMEM_TREE_RB_COLOR_BLACK;
- break;
- }
- node->parent=NULL;
- node->left=NULL;
- node->right=NULL;
- node->key32=key;
- node->data= func(ud);
- node->u.is_subtree = is_subtree;
- se_tree->tree=node;
- return node->data;
- }
-
- /* it was not the new root so walk the tree until we find where to
- * insert this new leaf.
- */
- while(1){
- /* this node already exists, so just return the data pointer*/
- if(key==node->key32){
- return node->data;
- }
- if(key<node->key32) {
- if(!node->left){
- /* new node to the left */
- emem_tree_node_t *new_node;
- new_node=se_tree->malloc(sizeof(emem_tree_node_t));
- node->left=new_node;
- new_node->parent=node;
- new_node->left=NULL;
- new_node->right=NULL;
- new_node->key32=key;
- new_node->data= func(ud);
- new_node->u.is_subtree = is_subtree;
- node=new_node;
- break;
- }
- node=node->left;
- continue;
- }
- if(key>node->key32) {
- if(!node->right){
- /* new node to the right */
- emem_tree_node_t *new_node;
- new_node=se_tree->malloc(sizeof(emem_tree_node_t));
- node->right=new_node;
- new_node->parent=node;
- new_node->left=NULL;
- new_node->right=NULL;
- new_node->key32=key;
- new_node->data= func(ud);
- new_node->u.is_subtree = is_subtree;
- node=new_node;
- break;
- }
- node=node->right;
- continue;
- }
- }
-
- /* node will now point to the newly created node */
- switch(se_tree->type){
- case EMEM_TREE_TYPE_RED_BLACK:
- node->u.rb_color=EMEM_TREE_RB_COLOR_RED;
- rb_insert_case1(se_tree, node);
- break;
- }
-
- return node->data;
-}
-
-/* When the se data is released, this entire tree will dissapear as if it
- * never existed including all metadata associated with the tree.
- */
-emem_tree_t *
-se_tree_create_non_persistent(int type, const char *name)
-{
- emem_tree_t *tree_list;
-
- tree_list=se_alloc(sizeof(emem_tree_t));
- tree_list->next=NULL;
- tree_list->type=type;
- tree_list->tree=NULL;
- tree_list->name=name;
- tree_list->malloc=se_alloc;
-
- return tree_list;
-}
-
-/* This tree is PErmanent and will never be released
- */
-emem_tree_t *
-pe_tree_create(int type, const char *name)
-{
- emem_tree_t *tree_list;
-
- tree_list=g_new(emem_tree_t, 1);
- tree_list->next=NULL;
- tree_list->type=type;
- tree_list->tree=NULL;
- tree_list->name=name;
- tree_list->malloc=(void *(*)(size_t)) g_malloc;
-
- return tree_list;
-}
-
-/* create another (sub)tree using the same memory allocation scope
- * as the parent tree.
- */
-static emem_tree_t *
-emem_tree_create_subtree(emem_tree_t *parent_tree, const char *name)
-{
- emem_tree_t *tree_list;
-
- tree_list=parent_tree->malloc(sizeof(emem_tree_t));
- tree_list->next=NULL;
- tree_list->type=parent_tree->type;
- tree_list->tree=NULL;
- tree_list->name=name;
- tree_list->malloc=parent_tree->malloc;
-
- return tree_list;
-}
-
-static void* create_sub_tree(void* d) {
- emem_tree_t *se_tree = d;
- return emem_tree_create_subtree(se_tree, "subtree");
-}
-
-/* insert a new node in the tree. if this node matches an already existing node
- * then just replace the data for that node */
-
-void
-emem_tree_insert32_array(emem_tree_t *se_tree, emem_tree_key_t *key, void *data)
-{
- emem_tree_t *next_tree;
-
- if((key[0].length<1)||(key[0].length>100)){
- DISSECTOR_ASSERT_NOT_REACHED();
- }
- if((key[0].length==1)&&(key[1].length==0)){
- emem_tree_insert32(se_tree, *key[0].key, data);
- return;
- }
-
- next_tree=lookup_or_insert32(se_tree, *key[0].key, create_sub_tree, se_tree, EMEM_TREE_NODE_IS_SUBTREE);
-
- if(key[0].length==1){
- key++;
- } else {
- key[0].length--;
- key[0].key++;
- }
- emem_tree_insert32_array(next_tree, key, data);
-}
-
-void *
-emem_tree_lookup32_array(emem_tree_t *se_tree, emem_tree_key_t *key)
-{
- emem_tree_t *next_tree;
-
- if((key[0].length<1)||(key[0].length>100)){
- DISSECTOR_ASSERT_NOT_REACHED();
- }
- if((key[0].length==1)&&(key[1].length==0)){
- return emem_tree_lookup32(se_tree, *key[0].key);
- }
- next_tree=emem_tree_lookup32(se_tree, *key[0].key);
- if(!next_tree){
- return NULL;
- }
- if(key[0].length==1){
- key++;
- } else {
- key[0].length--;
- key[0].key++;
- }
- return emem_tree_lookup32_array(next_tree, key);
-}
-
-
-/* Strings are stored as an array of uint32 containing the string characters
- with 4 characters in each uint32.
- The first byte of the string is stored as the most significant byte.
- If the string is not a multiple of 4 characters in length the last
- uint32 containing the string bytes are padded with 0 bytes.
- After the uint32's containing the string, there is one final terminator
- uint32 with the value 0x00000001
-*/
-void
-emem_tree_insert_string(emem_tree_t* se_tree, const gchar* k, void* v, guint32 flags)
-{
- emem_tree_key_t key[2];
- guint32 *aligned=NULL;
- guint32 len = (guint32) strlen(k);
- guint32 div = (len+3)/4+1;
- guint32 i;
- guint32 tmp;
-
- aligned = g_malloc(div * sizeof (guint32));
-
- /* pack the bytes one one by one into guint32s */
- tmp = 0;
- for (i = 0;i < len;i++) {
- unsigned char ch;
-
- ch = (unsigned char)k[i];
- if (flags & EMEM_TREE_STRING_NOCASE) {
- if(isupper(ch)) {
- ch = tolower(ch);
- }
- }
- tmp <<= 8;
- tmp |= ch;
- if (i%4 == 3) {
- aligned[i/4] = tmp;
- tmp = 0;
- }
- }
- /* add required padding to the last uint32 */
- if (i%4 != 0) {
- while (i%4 != 0) {
- i++;
- tmp <<= 8;
- }
- aligned[i/4-1] = tmp;
- }
-
- /* add the terminator */
- aligned[div-1] = 0x00000001;
-
- key[0].length = div;
- key[0].key = aligned;
- key[1].length = 0;
- key[1].key = NULL;
-
-
- emem_tree_insert32_array(se_tree, key, v);
- g_free(aligned);
-}
-
-void *
-emem_tree_lookup_string(emem_tree_t* se_tree, const gchar* k, guint32 flags)
-{
- emem_tree_key_t key[2];
- guint32 *aligned=NULL;
- guint32 len = (guint) strlen(k);
- guint32 div = (len+3)/4+1;
- guint32 i;
- guint32 tmp;
- void *ret;
-
- aligned = g_malloc(div * sizeof (guint32));
-
- /* pack the bytes one one by one into guint32s */
- tmp = 0;
- for (i = 0;i < len;i++) {
- unsigned char ch;
-
- ch = (unsigned char)k[i];
- if (flags & EMEM_TREE_STRING_NOCASE) {
- if(isupper(ch)) {
- ch = tolower(ch);
- }
- }
- tmp <<= 8;
- tmp |= ch;
- if (i%4 == 3) {
- aligned[i/4] = tmp;
- tmp = 0;
- }
- }
- /* add required padding to the last uint32 */
- if (i%4 != 0) {
- while (i%4 != 0) {
- i++;
- tmp <<= 8;
- }
- aligned[i/4-1] = tmp;
- }
-
- /* add the terminator */
- aligned[div-1] = 0x00000001;
-
- key[0].length = div;
- key[0].key = aligned;
- key[1].length = 0;
- key[1].key = NULL;
-
-
- ret = emem_tree_lookup32_array(se_tree, key);
- g_free(aligned);
- return ret;
-}
-
static gboolean
emem_tree_foreach_nodes(emem_tree_node_t* node, tree_foreach_func callback, void *user_data)
{
}
if (node->u.is_subtree == EMEM_TREE_NODE_IS_SUBTREE) {
- stop_traverse = emem_tree_foreach(node->data, callback, user_data);
+ stop_traverse = emem_tree_foreach((emem_tree_t *)node->data, callback, user_data);
} else {
stop_traverse = callback(node->data, user_data);
}
return emem_tree_foreach_nodes(emem_tree->tree, callback, user_data);
}
+static void emem_print_subtree(emem_tree_t* emem_tree, guint32 level);
static void
-emem_tree_print_nodes(emem_tree_node_t* node, int level)
+emem_tree_print_nodes(const char *prefix, emem_tree_node_t* node, guint32 level)
{
- int i;
+ guint32 i;
if (!node)
return;
printf(" ");
}
- printf("NODE:%p parent:%p left:0x%p right:%px key:%d data:%p\n",
+ printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%u %s:%p\n", prefix,
(void *)node,(void *)(node->parent),(void *)(node->left),(void *)(node->right),
- (node->key32),node->data);
+ (node->u.rb_color)?"Black":"Red",(node->key32),(node->u.is_subtree)?"tree":"data",node->data);
if(node->left)
- emem_tree_print_nodes(node->left, level+1);
+ emem_tree_print_nodes("L-", node->left, level+1);
if(node->right)
- emem_tree_print_nodes(node->right, level+1);
+ emem_tree_print_nodes("R-", node->right, level+1);
+
+ if (node->u.is_subtree)
+ emem_print_subtree((emem_tree_t *)node->data, level+1);
}
-void
-emem_print_tree(emem_tree_t* emem_tree)
+
+static void
+emem_print_subtree(emem_tree_t* emem_tree, guint32 level)
{
+ guint32 i;
+
if (!emem_tree)
return;
- printf("EMEM tree type:%d name:%s tree:%p\n",emem_tree->type,emem_tree->name,(void *)(emem_tree->tree));
+ for(i=0;i<level;i++){
+ printf(" ");
+ }
+
+ printf("EMEM tree:%p type:%s name:%s root:%p\n",(void *)emem_tree,(emem_tree->type==1)?"RedBlack":"unknown",emem_tree->name,(void *)(emem_tree->tree));
if(emem_tree->tree)
- emem_tree_print_nodes(emem_tree->tree, 0);
+ emem_tree_print_nodes("Root-", emem_tree->tree, level);
+}
+
+void
+emem_print_tree(emem_tree_t* emem_tree)
+{
+ emem_print_subtree(emem_tree, 0);
}
/*
#define MAX_STRBUF_LEN 65536
static gsize
-next_size(gsize cur_alloc_len, gsize wanted_alloc_len, gsize max_alloc_len) {
+next_size(gsize cur_alloc_len, gsize wanted_alloc_len, gsize max_alloc_len)
+{
if (max_alloc_len < 1 || max_alloc_len > MAX_STRBUF_LEN) {
max_alloc_len = MAX_STRBUF_LEN;
}
}
static void
-ep_strbuf_grow(emem_strbuf_t *strbuf, gsize wanted_alloc_len) {
+ep_strbuf_grow(emem_strbuf_t *strbuf, gsize wanted_alloc_len)
+{
gsize new_alloc_len;
gchar *new_str;
}
new_alloc_len = next_size(strbuf->alloc_len, wanted_alloc_len, strbuf->max_alloc_len);
- new_str = ep_alloc(new_alloc_len);
+ new_str = (gchar *)ep_alloc(new_alloc_len);
g_strlcpy(new_str, strbuf->str, new_alloc_len);
strbuf->alloc_len = new_alloc_len;
}
emem_strbuf_t *
-ep_strbuf_sized_new(gsize alloc_len, gsize max_alloc_len) {
+ep_strbuf_sized_new(gsize alloc_len, gsize max_alloc_len)
+{
emem_strbuf_t *strbuf;
- strbuf = ep_alloc(sizeof(emem_strbuf_t));
+ strbuf = ep_new(emem_strbuf_t);
if ((max_alloc_len == 0) || (max_alloc_len > MAX_STRBUF_LEN))
max_alloc_len = MAX_STRBUF_LEN;
else if (alloc_len > max_alloc_len)
alloc_len = max_alloc_len;
- strbuf->str = ep_alloc(alloc_len);
+ strbuf->str = (char *)ep_alloc(alloc_len);
strbuf->str[0] = '\0';
strbuf->len = 0;
}
emem_strbuf_t *
-ep_strbuf_new(const gchar *init) {
+ep_strbuf_new(const gchar *init)
+{
emem_strbuf_t *strbuf;
- strbuf = ep_strbuf_sized_new(next_size(0, init?strlen(init):0, 0), 0);
+ strbuf = ep_strbuf_sized_new(next_size(0, init?strlen(init)+1:0, 0), 0); /* +1 for NULL terminator */
if (init) {
gsize full_len;
full_len = g_strlcpy(strbuf->str, init, strbuf->alloc_len);
}
emem_strbuf_t *
-ep_strbuf_new_label(const gchar *init) {
+ep_strbuf_new_label(const gchar *init)
+{
emem_strbuf_t *strbuf;
gsize full_len;
}
emem_strbuf_t *
-ep_strbuf_append(emem_strbuf_t *strbuf, const gchar *str) {
+ep_strbuf_append(emem_strbuf_t *strbuf, const gchar *str)
+{
gsize add_len, full_len;
if (!strbuf || !str || str[0] == '\0') {
}
void
-ep_strbuf_append_vprintf(emem_strbuf_t *strbuf, const gchar *format, va_list ap) {
+ep_strbuf_append_vprintf(emem_strbuf_t *strbuf, const gchar *format, va_list ap)
+{
va_list ap2;
gsize add_len, full_len;
}
void
-ep_strbuf_append_printf(emem_strbuf_t *strbuf, const gchar *format, ...) {
+ep_strbuf_append_printf(emem_strbuf_t *strbuf, const gchar *format, ...)
+{
va_list ap;
va_start(ap, format);
}
void
-ep_strbuf_printf(emem_strbuf_t *strbuf, const gchar *format, ...) {
+ep_strbuf_printf(emem_strbuf_t *strbuf, const gchar *format, ...)
+{
va_list ap;
if (!strbuf) {
return;
}
emem_strbuf_t *
-ep_strbuf_append_c(emem_strbuf_t *strbuf, const gchar c) {
+ep_strbuf_append_c(emem_strbuf_t *strbuf, const gchar c)
+{
if (!strbuf) {
return strbuf;
}
}
emem_strbuf_t *
-ep_strbuf_truncate(emem_strbuf_t *strbuf, gsize len) {
+ep_strbuf_append_unichar(emem_strbuf_t *strbuf, const gunichar c)
+{
+ gchar buf[6];
+ gint charlen;
+
+ if (!strbuf) {
+ return strbuf;
+ }
+
+ charlen = g_unichar_to_utf8(c, buf);
+
+ /* +charlen for the new character & +1 for the trailing '\0'. */
+ if (strbuf->alloc_len < strbuf->len + charlen + 1) {
+ ep_strbuf_grow(strbuf, strbuf->len + charlen + 1);
+ }
+ if (strbuf->alloc_len >= strbuf->len + charlen + 1) {
+ memcpy(&strbuf->str[strbuf->len], buf, charlen);
+ strbuf->len += charlen;
+ strbuf->str[strbuf->len] = '\0';
+ }
+
+ return strbuf;
+}
+
+emem_strbuf_t *
+ep_strbuf_truncate(emem_strbuf_t *strbuf, gsize len)
+{
if (!strbuf || len >= strbuf->len) {
return strbuf;
}
* indent-tabs-mode: t
* End:
*
- * ex: set shiftwidth=8 tabstop=8 noexpandtab
+ * ex: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/
git.samba.org / metze / wireshark / wip.git / blobdiff