r21064: The core of this patch is

[samba.git] / source3 / lib / tallocmsg.c

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 599d60737def5f18bd910c43ebd997da94e69a5a..0f493538f3c104a21f27c7cc58fed2270ff3cd91 100644 (file)
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -26,6 +26,7 @@
  **/
 
 struct msg_pool_usage_state {
+       TALLOC_CTX *mem_ctx;
        ssize_t len;
        size_t buflen;
        char *s;
@@ -37,13 +38,13 @@ static void msg_pool_usage_helper(const void *ptr, int depth, int max_depth, int
        struct msg_pool_usage_state *state = (struct msg_pool_usage_state *)_s;
 
        if (is_ref) {
-               sprintf_append(NULL, &state->s, &state->len, &state->buflen,
+               sprintf_append(state->mem_ctx, &state->s, &state->len, &state->buflen,
                               "%*sreference to: %s\n", depth*4, "", name);
                return;
        }
 
        if (depth == 0) {
-               sprintf_append(NULL, &state->s, &state->len, &state->buflen,
+               sprintf_append(state->mem_ctx, &state->s, &state->len, &state->buflen,
                               "%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\n", 
                               (max_depth < 0 ? "full " :""), name,
                               (unsigned long)talloc_total_size(ptr),
@@ -51,7 +52,7 @@ static void msg_pool_usage_helper(const void *ptr, int depth, int max_depth, int
                return;
        }
 
-       sprintf_append(NULL, &state->s, &state->len, &state->buflen,
+       sprintf_append(state->mem_ctx, &state->s, &state->len, &state->buflen,
                       "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d)\n", 
                       depth*4, "",
                       name,
@@ -65,7 +66,8 @@ static void msg_pool_usage_helper(const void *ptr, int depth, int max_depth, int
  * usage stats.
  **/
 void msg_pool_usage(int msg_type, struct process_id src_pid,
-                   void *UNUSED(buf), size_t UNUSED(len))
+                   void *UNUSED(buf), size_t UNUSED(len),
+                   void *private_data)
 {
        struct msg_pool_usage_state state;
 
@@ -73,6 +75,10 @@ void msg_pool_usage(int msg_type, struct process_id src_pid,
        
        DEBUG(2,("Got POOL_USAGE\n"));
 
+       state.mem_ctx = talloc_init("msg_pool_usage");
+       if (!state.mem_ctx) {
+               return;
+       }
        state.len       = 0;
        state.buflen    = 512;
        state.s         = NULL;
@@ -80,13 +86,14 @@ void msg_pool_usage(int msg_type, struct process_id src_pid,
        talloc_report_depth_cb(NULL, 0, -1, msg_pool_usage_helper, &state);
 
        if (!state.s) {
+               talloc_destroy(state.mem_ctx);
                return;
        }
        
        message_send_pid(src_pid, MSG_POOL_USAGE,
                         state.s, strlen(state.s)+1, True);
 
-       SAFE_FREE(state.s);
+       talloc_destroy(state.mem_ctx);
 }
 
 /**
@@ -94,6 +101,6 @@ void msg_pool_usage(int msg_type, struct process_id src_pid,
  **/
 void register_msg_pool_usage(void)
 {
-       message_register(MSG_REQ_POOL_USAGE, msg_pool_usage);
+       message_register(MSG_REQ_POOL_USAGE, msg_pool_usage, NULL);
        DEBUG(2, ("Registered MSG_REQ_POOL_USAGE\n"));
 }