Mesa (thalloc): thalloc: Implement misc functions

[Jakob Bornecrantz]

Module: Mesa
Branch: thalloc
Commit: 507452fd7e3af9a3c4fe818eaa7f04d813c0d1ba
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=507452fd7e3af9a3c4fe818eaa7f04d813c0d1ba

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Jan 19 02:28:37 2011 +0100

thalloc: Implement misc functions

Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>

---

 src/thalloc/halloc.c |   73 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/thalloc/halloc.h |    7 +++++
 src/thalloc/talloc.h |   17 ++---------
 3 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/src/thalloc/halloc.c b/src/thalloc/halloc.c
index ba41134..d71f328 100644
--- a/src/thalloc/halloc.c
+++ b/src/thalloc/halloc.c
@@ -14,6 +14,7 @@
 
 #include <malloc.h>  /* realloc */
 #include <string.h>  /* memset & co */
+#include <stdlib.h>  /* atexit */
 
 #include "halloc.h"
 #include "align.h"
@@ -30,6 +31,8 @@ typedef struct hblock
 #endif
 	hlist_item_t  siblings; /* 2 pointers */
 	hlist_head_t  children; /* 1 pointer  */
+	int (*dtor)(void *ptr);
+	void *parent;
 	max_align_t   data[1];  /* not allocated, see below */
 	
 } hblock_t;
@@ -51,6 +54,7 @@ static void * _realloc(void * ptr, size_t n);
 
 static int  _relate(hblock_t * b, hblock_t * p);
 static void _free_children(hblock_t * p);
+static void _destruct(hblock_t * p);
 
 /*
  *	Core API
@@ -58,6 +62,7 @@ static void _free_children(hblock_t * p);
 void * halloc(void * ptr, size_t len)
 {
 	hblock_t * p;
+	hlist_item_t * i, * tmp;
 
 	/* set up default allocator */
 	if (! allocator)
@@ -80,6 +85,8 @@ void * halloc(void * ptr, size_t len)
 #endif
 		hlist_init(&p->children);
 		hlist_init_item(&p->siblings);
+		p->parent = NULL;
+		p->dtor = NULL;
 
 		return p->data;
 	}
@@ -96,11 +103,18 @@ void * halloc(void * ptr, size_t len)
 
 		hlist_relink(&p->siblings);
 		hlist_relink_head(&p->children);
-		
+
+		hlist_for_each_safe(i, tmp, &p->children)
+		{
+			hblock_t * q = structof(i, hblock_t, siblings);
+			q->parent = p->data;
+		}
+
 		return p->data;
 	}
 
 	/* free */
+	_destruct(p);
 	_free_children(p);
 	hlist_del(&p->siblings);
 	allocator(p, 0);
@@ -123,6 +137,7 @@ void hattach(void * block, void * parent)
 	assert(b->magic == HH_MAGIC);
 
 	hlist_del(&b->siblings);
+	b->parent = NULL;
 
 	if (! parent)
 		return;
@@ -136,6 +151,7 @@ void hattach(void * block, void * parent)
 	assert(! _relate(p, b)); /* heavy ! */
 
 	hlist_add(&p->children, &b->siblings);
+	b->parent = p->data;
 }
 
 /*
@@ -247,8 +263,63 @@ static void _free_children(hblock_t * p)
 	hlist_for_each_safe(i, tmp, &p->children)
 	{
 		hblock_t * q = structof(i, hblock_t, siblings);
+		_destruct(q);
 		_free_children(q);
 		allocator(q, 0);
 	}
 }
 
+static void _destruct(hblock_t * p)
+{
+	if (p->dtor)
+		assert(p->dtor(&p->data) == 0);
+}
+
+
+/*
+ * new stuff
+ */
+static void *atexit_ctx = NULL;
+
+static void halloc_atexit()
+{
+	halloc(atexit_ctx, 0);
+}
+
+void *
+h_autofree_context(void) {
+	void *ret;
+
+	if (atexit_ctx == NULL) {
+		atexit_ctx = halloc(NULL, 1);
+		atexit(halloc_atexit);
+	}
+
+	ret = halloc(NULL, 1);
+	if (ret)
+		hattach(ret, atexit_ctx);
+
+	return ret;
+}
+
+void * h_get_parent(const void *block)
+{
+	hblock_t * b;
+	
+	if (! block)
+		return NULL;
+
+	b = structof(block, hblock_t, data);
+	return b->parent;
+}
+
+void h_set_destructor(void *block, int (*destructor)(void *block))
+{
+	hblock_t * b;
+	
+	if (! block)
+		return;
+
+	b = structof(block, hblock_t, data);
+	b->dtor = destructor;
+}
diff --git a/src/thalloc/halloc.h b/src/thalloc/halloc.h
index 10af4e8..9b370a6 100644
--- a/src/thalloc/halloc.h
+++ b/src/thalloc/halloc.h
@@ -39,5 +39,12 @@ typedef void * (* realloc_t)(void * ptr, size_t len);
 
 extern realloc_t halloc_allocator;
 
+/*
+ *      new additions
+ */
+void * h_autofree_context(void);
+void * h_get_parent(const void *ptr);
+void h_set_destructor(void *ptr, int (*destructor)(void *ptr));
+
 #endif
 
diff --git a/src/thalloc/talloc.h b/src/thalloc/talloc.h
index e720441..a295eb0 100644
--- a/src/thalloc/talloc.h
+++ b/src/thalloc/talloc.h
@@ -13,11 +13,7 @@
 
 #include "halloc.h"
 
-static inline void *
-talloc_autofree_context(void) {
-   assert(0);
-   return NULL;
-}
+#define talloc_autofree_context h_autofree_context
 
 static inline int
 talloc_free(void *ptr) {
@@ -31,11 +27,7 @@ talloc_init(const char *fmt, ...) {
    return halloc(NULL, 1);
 }
 
-static inline void *
-talloc_parent(const void *ptr) {
-   assert(0);
-   return NULL;
-}
+#define talloc_parent(_ptr) h_get_parent(_ptr)
 
 static inline void *
 talloc_realloc_size(const void *ctx, void *ptr, size_t size) {
@@ -54,10 +46,7 @@ talloc_reference(const void *ctx, const void *ptr) {
    return NULL;
 }
 
-static inline void 
-talloc_set_destructor(void *ctx, int (*destructor)(void*)) {
-   assert(0);
-}
+#define talloc_set_destructor(_ctx, _des) h_set_destructor(_ctx, _des)
 
 static inline void *
 talloc_size(const void *ctx, size_t size) {