*
* 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 */
#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
+#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 (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)
typedef struct _emem_chunk_t {
struct _emem_chunk_t *next;
char *buf;
+ size_t size;
unsigned int amount_free_init;
unsigned int amount_free;
unsigned int free_offset_init;
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_tree_t *trees; /* only used by se_mem allocator */
guint8 canary[EMEM_CANARY_DATA_SIZE];
- void *(*memory_alloc)(size_t size, struct _emem_header_t *);
+ void *(*memory_alloc)(size_t size, struct _emem_pool_t *);
/*
* Tools like Valgrind and ElectricFence don't work well with memchunks.
*/
gboolean debug_verify_pointers;
-} emem_header_t;
+} emem_pool_t;
-static emem_header_t ep_packet_mem;
-static emem_header_t se_packet_mem;
+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:
#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_header_t *mem);
-static void *emem_alloc_glib(size_t size, emem_header_t *mem);
+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.
memcpy(&ptr, &canary[i+1], sizeof(void *));
if (len)
- *len = i + 1 + sizeof(void *);
+ *len = i + 1 + (int)sizeof(void *);
return ptr;
}
}
/*
- * 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)
while (canary_next != NULL) {
canary_next = emem_canary_next(ep_packet_mem.canary, canary_next, NULL);
- /* XXX, check if canary_last is inside allocated memory? */
+ /* XXX, check if canary_next is inside allocated memory? */
- if (npc->canary_last == (void *) -1)
+ if (canary_next == (void *) -1)
g_error("Per-packet memory corrupted\nbetween: %s\nand: %s", there, here);
}
}
#endif
static void
-emem_init_chunk(emem_header_t *mem)
+emem_init_chunk(emem_pool_t *mem)
{
if (mem->debug_use_canary)
emem_canary_init(mem->canary);
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
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 */
#endif
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.
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_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.
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);
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 total_headers;
guint i;
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) {
fprintf (stderr, "\n");
num_allocs = 0;
total_used = 0;
total_allocation = 0;
- total_free = 0;
used_for_canaries = 0;
}
num_chunks++;
total_used += (chunk->amount_free_init - chunk->amount_free);
total_allocation += chunk->amount_free_init;
- total_free += chunk->amount_free;
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, ptr, &len);
+ ptr = emem_canary_next(se_packet_mem.canary, (guint8*)ptr, &len);
if (ptr == (void *) -1)
g_error("Memory corrupted");
#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)
{
emem_scrub_memory(char *buf, size_t size, gboolean alloc)
{
guint scrubbed_value;
- guint offset;
+ size_t offset;
if (!debug_use_memory_scrubber)
return;
* memory).
*/
- /* XXX - We might want to use memset here in order to avoid problems on
- * alignment-sensitive platforms, e.g.
+ /* 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*)(buf+offset) = scrubbed_value;
+ *(guint*)(void*)(buf+offset) = scrubbed_value;
/* Initialize the last bytes, if any */
if (offset < size) {
offset++;
if (offset < size) {
*(guint8*)(buf+offset) = (scrubbed_value >> 8) & 0xFF;
- offset++;
}
}
}
}
static emem_chunk_t *
-emem_create_chunk(void) {
-#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_create_chunk(size_t size)
+{
emem_chunk_t *npc;
npc = g_new(emem_chunk_t, 1);
*/
/* 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) {
g_free(npc);
- THROW(OutOfMemoryError);
+ if (getenv("WIRESHARK_ABORT_ON_OUT_OF_MEMORY"))
+ abort();
+ else
+ THROW(OutOfMemoryError);
}
#elif defined(USE_GUARD_PAGES)
- npc->buf = mmap(NULL, EMEM_PACKET_CHUNK_SIZE,
+ npc->buf = (char *)mmap(NULL, size,
PROT_READ|PROT_WRITE, ANON_PAGE_MODE, ANON_FD, 0);
if (npc->buf == MAP_FAILED) {
g_free(npc);
- THROW(OutOfMemoryError);
+ if (getenv("WIRESHARK_ABORT_ON_OUT_OF_MEMORY"))
+ abort();
+ else
+ THROW(OutOfMemoryError);
}
#else /* Is there a draft in here? */
- npc->buf = g_malloc(EMEM_PACKET_CHUNK_SIZE);
+ npc->buf = g_malloc(size);
/* g_malloc() can't fail */
#endif
total_no_chunks++;
#endif
+ 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)
- buf_end = npc->buf + EMEM_PACKET_CHUNK_SIZE;
+ 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->free_offset_init = (unsigned int) (prot1 - npc->buf) + pagesize;
#elif defined(USE_GUARD_PAGES)
- buf_end = npc->buf + EMEM_PACKET_CHUNK_SIZE;
+ buf_end = npc->buf + size;
/* Align our guard pages on page-sized boundaries */
prot1 = (char *) ((((intptr_t) npc->buf + pagesize - 1) / pagesize) * pagesize);
ret = mprotect(prot2, pagesize, PROT_NONE);
g_assert(ret != -1);
- npc->amount_free_init = prot2 - prot1 - pagesize;
- npc->free_offset_init = (prot1 - npc->buf) + pagesize;
+ npc->amount_free_init = (unsigned int)(prot2 - prot1 - pagesize);
+ npc->free_offset_init = (unsigned int)((prot1 - npc->buf) + pagesize);
#else
- npc->amount_free_init = EMEM_PACKET_CHUNK_SIZE;
+ npc->amount_free_init = size;
npc->free_offset_init = 0;
#endif /* USE_GUARD_PAGES */
}
static void *
-emem_alloc_chunk(size_t size, emem_header_t *mem)
+emem_alloc_chunk(size_t size, emem_pool_t *mem)
{
void *buf;
guint8 pad;
emem_chunk_t *free_list;
- /* Round up to an 8 byte boundary. Make sure we have at least
- * 8 pad bytes for our canary.
+ /* 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) {
- pad = emem_canary_pad(asize);
asize += sizeof(void *);
+ pad = emem_canary_pad(asize);
} else
- pad = (G_MEM_ALIGN - (asize & (G_MEM_ALIGN-1))) & (G_MEM_ALIGN-1);
+ pad = (WS_MEM_ALIGN - (asize & (WS_MEM_ALIGN-1))) & (WS_MEM_ALIGN-1);
asize += pad;
DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2));
if (!mem->free_list)
- mem->free_list = emem_create_chunk();
+ 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
mem->used_list=npc;
if (!mem->free_list)
- mem->free_list = emem_create_chunk();
+ mem->free_list = emem_create_chunk_gp(EMEM_PACKET_CHUNK_SIZE);
}
free_list = mem->free_list;
}
static void *
-emem_alloc_glib(size_t size, emem_header_t *mem)
+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=g_malloc(size);
+ 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->free_offset = npc->free_offset_init = 0;
- npc->amount_free = npc->amount_free_init = (unsigned int) size;
+ 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_header_t *mem)
+emem_alloc(size_t size, emem_pool_t *mem)
{
- void *buf = mem->memory_alloc(size, 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(buf, size, TRUE);
+ emem_scrub_memory((char *)buf, size, TRUE);
return buf;
}
return memset(ep_alloc(size),'\0',size);
}
-gchar *
-ep_strdup(const gchar* src)
+void *
+se_alloc0(size_t size)
{
- guint len = (guint) strlen(src);
- gchar* dst;
+ return memset(se_alloc(size),'\0',size);
+}
+
+static gchar *
+emem_strdup(const gchar *src, void *allocator(size_t))
+{
+ guint len;
+ gchar *dst;
+
+ /* 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 = memcpy(ep_alloc(len+1), src, len+1);
+ len = (guint) strlen(src);
+ dst = (gchar *)memcpy(allocator(len+1), src, len+1);
return dst;
}
gchar *
-ep_strndup(const gchar* src, size_t len)
+ep_strdup(const gchar *src)
{
- gchar* dst = ep_alloc(len+1);
+ 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;
}
+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;
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);
}
gchar *
-ep_strdup_printf(const gchar* fmt, ...)
+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 *
+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)
{
return vec;
}
-
-
-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)
+ep_strconcat(const gchar *string1, ...)
{
- guint len;
- gchar* dst;
-
- if(!src)
- return "<NULL>";
-
- len = (guint) strlen(src);
- dst = memcpy(se_alloc(len+1), src, len+1);
-
- return dst;
-}
+ gsize l;
+ va_list args;
+ gchar *s;
+ gchar *concat;
+ gchar *ptr;
-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;
+ if (!string1)
+ return NULL;
- G_VA_COPY(ap2, ap);
+ 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 = g_printf_string_upper_bound(fmt, ap);
+ concat = (gchar *)ep_alloc(l);
+ ptr = concat;
- 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)
+emem_free_all(emem_pool_t *mem)
{
gboolean use_chunks = mem->debug_use_chunks;
while (npc != NULL) {
if (use_chunks) {
while (npc->canary_last != NULL) {
- npc->canary_last = emem_canary_next(mem->canary, 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)
emem_free_all(&se_packet_mem);
}
-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_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=(emem_tree_t *)g_malloc(sizeof(emem_tree_t));
tree_list->next=se_packet_mem.trees;
tree_list->type=type;
tree_list->tree=NULL;
return NULL;
}
-void *
-emem_tree_lookup32_le(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;
- }
- }
-
- 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;
- }
- }
-
-}
-
-
static inline emem_tree_node_t *
emem_tree_parent(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(!se_tree || !key) return NULL; /* prevent searching on NULL pointer */
-
- 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);
-}
-
-void *
-emem_tree_lookup32_array_le(emem_tree_t *se_tree, emem_tree_key_t *key)
-{
- emem_tree_t *next_tree;
-
- if(!se_tree || !key) return NULL; /* prevent searching on NULL pointer */
-
- if((key[0].length<1)||(key[0].length>100)){
- DISSECTOR_ASSERT_NOT_REACHED();
- }
- if((key[0].length==1)&&(key[1].length==0)){ /* last key in key array */
- return emem_tree_lookup32_le(se_tree, *key[0].key);
- }
- next_tree=emem_tree_lookup32(se_tree, *key[0].key);
- /* key[0].key not found so find le and return */
- if(!next_tree)
- return emem_tree_lookup32_le(se_tree, *key[0].key);
-
- /* key[0].key found so inc key pointer and try again */
- if(key[0].length==1){
- key++;
- } else {
- key[0].length--;
- key[0].key++;
- }
- return emem_tree_lookup32_array_le(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 divx = (len+3)/4+1;
- guint32 i;
- guint32 tmp;
-
- aligned = g_malloc(divx * 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[divx-1] = 0x00000001;
-
- key[0].length = divx;
- 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 divx = (len+3)/4+1;
- guint32 i;
- guint32 tmp;
- void *ret;
-
- aligned = g_malloc(divx * 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[divx-1] = 0x00000001;
-
- key[0].length = divx;
- 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);
}
/*
}
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 *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;
return strbuf;
}
+emem_strbuf_t *
+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)
{
* 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