Allow custom memory management

Provides functions to replace standard malloc/calloc/realloc/free

Signed-off-by: Francis Bouvier <[email protected]>

bindings/hubbub/utils.h

@@ -5,6 +5,8 @@
  * Copyright 2007 John-Mark Bell <[email protected]>
  */
 
+#include <stdlib.h>
+
 #ifndef dom_hubbub_utils_h_
 #define dom_hubbub_utils_h_
 
@@ -25,4 +27,24 @@
 #define UNUSED(x) ((void)(x))
 #endif
 
+#ifndef malloc_custom
+#define malloc_custom
+
+typedef void *(*custom_malloc)(size_t);
+typedef void *(*custom_realloc)(void*, size_t);
+typedef void *(*custom_calloc)(size_t, size_t);
+typedef void (*custom_free)(void*);
+
+void *m_alloc(size_t size);
+void *re_alloc(void *ptr, size_t size);
+void *c_alloc(size_t elementCount, size_t size);
+void f_ree(void *ptr);
+
+#define malloc(size) m_alloc(size)
+#define realloc(ptr, size) re_alloc(ptr, size)
+#define calloc(elementCount, size) c_alloc(elementCount, size)
+#define free(ptr) f_ree(ptr)
+
+#endif
+
 #endif

bindings/xml/utils.h

@@ -5,6 +5,8 @@
  * Copyright 2007 John-Mark Bell <[email protected]>
  */
 
+#include <stdlib.h>
+
 #ifndef xml_utils_h_
 #define xml_utils_h_
 
@@ -25,4 +27,23 @@
 #define UNUSED(x) ((void)(x))
 #endif
 
+#ifndef malloc_custom
+#define malloc_custom
+typedef void *(*custom_malloc)(size_t);
+typedef void *(*custom_realloc)(void*, size_t);
+typedef void *(*custom_calloc)(size_t, size_t);
+typedef void (*custom_free)(void*);
+
+void *m_alloc(size_t size);
+void *re_alloc(void *ptr, size_t size);
+void *c_alloc(size_t elementCount, size_t size);
+void f_ree(void *ptr);
+
+#define malloc(size) m_alloc(size)
+#define realloc(ptr, size) re_alloc(ptr, size)
+#define calloc(elementCount, size) c_alloc(elementCount, size)
+#define free(ptr) f_ree(ptr)
+
+#endif
+
 #endif

src/events/event.h

@@ -15,6 +15,7 @@
 #include <dom/events/event.h>
 
 #include "utils/list.h"
+#include "utils/utils.h"
 
 /* The private virtual table */
 struct dom_event_private_vtable {

src/utils/Makefile

@@ -1,4 +1,4 @@
 # Sources
-DIR_SOURCES := namespace.c hashtable.c character_valid.c validate.c walk.c
+DIR_SOURCES := namespace.c hashtable.c character_valid.c validate.c walk.c utils.c
 
 include $(NSBUILD)/Makefile.subdir

src/utils/hashtable.c

@@ -15,6 +15,7 @@
 #include <stdio.h>
 #endif
 #include "utils/hashtable.h"
+#include "utils/utils.h"
 
 #include <libwapcaplet/libwapcaplet.h>
 

src/utils/utils.c

@@ -0,0 +1,23 @@
+#include <stdlib.h>
+#include "utils.h"
+
+custom_malloc my_malloc = malloc;
+custom_realloc my_realloc = realloc;
+custom_calloc my_calloc = calloc;
+custom_free my_free = free;
+
+void *m_alloc(size_t size)
+{
+  return my_malloc(size);
+}
+void *re_alloc(void *ptr, size_t size) {
+  return my_realloc(ptr, size);
+}
+void *c_alloc(size_t elementCount, size_t size)
+{
+  return my_calloc(elementCount, size);
+}
+void f_ree(void *ptr)
+{
+  my_free(ptr);
+}

src/utils/utils.h

@@ -5,6 +5,8 @@
  * Copyright 2007 John-Mark Bell <[email protected]>
  */
 
+#include <stdlib.h>
+
 #ifndef dom_utils_utils_h_
 #define dom_utils_utils_h_
 
@@ -25,4 +27,24 @@
 #define UNUSED(x) ((void)(x))
 #endif
 
+#ifndef malloc_custom
+#define malloc_custom
+
+typedef void *(*custom_malloc)(size_t);
+typedef void *(*custom_realloc)(void*, size_t);
+typedef void *(*custom_calloc)(size_t, size_t);
+typedef void (*custom_free)(void*);
+
+void *m_alloc(size_t size);
+void *re_alloc(void *ptr, size_t size);
+void *c_alloc(size_t elementCount, size_t size);
+void f_ree(void *ptr);
+
+#define malloc(size) m_alloc(size)
+#define realloc(ptr, size) re_alloc(ptr, size)
+#define calloc(elementCount, size) c_alloc(elementCount, size)
+#define free(ptr) f_ree(ptr)
+
+#endif
+
 #endif