talloc: add talloc_set_abort_fn()

metze

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index c472e9fda9c685e7bab11f1ff83f562662c0569e..60a48ad8112593754fe1729f2dc3e243924fc76d 100644 (file)
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -138,14 +138,30 @@ struct talloc_chunk {
 #define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)&~15)
 #define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc))
 
 #define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)&~15)
 #define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc))
 

+static void (*talloc_abort_fn)(const char *reason);
+
+void talloc_set_abort_fn(void (*abort_fn)(const char *reason))
+{
+       talloc_abort_fn = abort_fn;
+}
+
+static void talloc_abort(const char *reason)
+{
+       if (!talloc_abort_fn) {
+               TALLOC_ABORT(reason);
+       }
+
+       talloc_abort_fn(reason);
+}
+

 static void talloc_abort_double_free(void)
 {
 static void talloc_abort_double_free(void)
 {

-       TALLOC_ABORT("Bad talloc magic value - double free"); 
+       talloc_abort("Bad talloc magic value - double free");

 }
 
 static void talloc_abort_unknown_value(void)
 {
 }
 
 static void talloc_abort_unknown_value(void)
 {

-       TALLOC_ABORT("Bad talloc magic value - unknown value"); 
+       talloc_abort("Bad talloc magic value - unknown value");

 }
 
 /* panic if we get a bad magic value */
 }
 
 /* panic if we get a bad magic value */


@@ -564,7 +580,7 @@ static inline int _talloc_free(void *ptr)
                pool_object_count = talloc_pool_objectcount(pool);
 
                if (*pool_object_count == 0) {
                pool_object_count = talloc_pool_objectcount(pool);
 
                if (*pool_object_count == 0) {

-                       TALLOC_ABORT("Pool object count zero!");
+                       talloc_abort("Pool object count zero!");

                }
 
                *pool_object_count -= 1;
                }
 
                *pool_object_count -= 1;


@@ -810,7 +826,18 @@ static void talloc_abort_type_missmatch(const char *location,
                                        const char *name,
                                        const char *expected)
 {
                                        const char *name,
                                        const char *expected)
 {

-       TALLOC_ABORT("Type missmatch");
+       const char *reason;
+
+       reason = talloc_asprintf(NULL,
+                                "%s: Type mismatch: name[%s] expected[%s]",
+                                location,
+                                name?name:"NULL",
+                                expected);
+       if (!reason) {
+               reason = "Type mismatch";
+       }
+
+       talloc_abort(reason);

 }
 
 void *_talloc_get_type_abort(const void *ptr, const char *name, const char *location)
 }
 
 void *_talloc_get_type_abort(const void *ptr, const char *name, const char *location)

diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 002e06e52da9e175f9f4e6e48be320efc03c79c0..b62393494b6cef28e98aaf8ef31d3f279c8e1be5 100644 (file)
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -182,4 +182,6 @@ char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3)
 char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 char *talloc_asprintf_append_buffer(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 
 char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 char *talloc_asprintf_append_buffer(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 

+void talloc_set_abort_fn(void (*abort_fn)(const char *reason));
+

 #endif
 #endif