Revert "s3:messages: allow messaging_filtered_read_send() to use wrapper tevent_context"

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

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 599d60737def5f18bd910c43ebd997da94e69a5a..18b16edfc8f8b9f1ba69d90912b09240bbdfcc5a 100644 (file)
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -1,99 +1,57 @@
 /* 
    samba -- Unix SMB/CIFS implementation.
    Copyright (C) 2001, 2002 by Martin Pool
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-
-/**
- * @file tallocmsg.c
- *
- * Glue code between talloc profiling and the Samba messaging system.
- **/
-
-struct msg_pool_usage_state {
-       ssize_t len;
-       size_t buflen;
-       char *s;
-};
-
-static void msg_pool_usage_helper(const void *ptr, int depth, int max_depth, int is_ref, void *_s)
-{
-       const char *name = talloc_get_name(ptr);
-       struct msg_pool_usage_state *state = (struct msg_pool_usage_state *)_s;
-
-       if (is_ref) {
-               sprintf_append(NULL, &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,
-                              "%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\n", 
-                              (max_depth < 0 ? "full " :""), name,
-                              (unsigned long)talloc_total_size(ptr),
-                              (unsigned long)talloc_total_blocks(ptr));
-               return;
-       }
-
-       sprintf_append(NULL, &state->s, &state->len, &state->buflen,
-                      "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d)\n", 
-                      depth*4, "",
-                      name,
-                      (unsigned long)talloc_total_size(ptr),
-                      (unsigned long)talloc_total_blocks(ptr),
-                      talloc_reference_count(ptr));
-}
+#include "messages.h"
+#include "lib/util/talloc_report.h"
 
 /**
  * Respond to a POOL_USAGE message by sending back string form of memory
  * usage stats.
  **/
-void msg_pool_usage(int msg_type, struct process_id src_pid,
-                   void *UNUSED(buf), size_t UNUSED(len))
+static void msg_pool_usage(struct messaging_context *msg_ctx,
+                          void *private_data, 
+                          uint32_t msg_type, 
+                          struct server_id src,
+                          DATA_BLOB *data)
 {
-       struct msg_pool_usage_state state;
+       char *report;
 
        SMB_ASSERT(msg_type == MSG_REQ_POOL_USAGE);
-       
-       DEBUG(2,("Got POOL_USAGE\n"));
 
-       state.len       = 0;
-       state.buflen    = 512;
-       state.s         = NULL;
+       DEBUG(2,("Got POOL_USAGE\n"));
 
-       talloc_report_depth_cb(NULL, 0, -1, msg_pool_usage_helper, &state);
+       report = talloc_report_str(msg_ctx, NULL);
 
-       if (!state.s) {
-               return;
+       if (report != NULL) {
+               messaging_send_buf(msg_ctx, src, MSG_POOL_USAGE,
+                                  (uint8_t *)report,
+                                  talloc_get_size(report)-1);
        }
-       
-       message_send_pid(src_pid, MSG_POOL_USAGE,
-                        state.s, strlen(state.s)+1, True);
 
-       SAFE_FREE(state.s);
+       talloc_free(report);
 }
 
 /**
  * Register handler for MSG_REQ_POOL_USAGE
  **/
-void register_msg_pool_usage(void)
+void register_msg_pool_usage(struct messaging_context *msg_ctx)
 {
-       message_register(MSG_REQ_POOL_USAGE, msg_pool_usage);
+       messaging_register(msg_ctx, NULL, MSG_REQ_POOL_USAGE, msg_pool_usage);
        DEBUG(2, ("Registered MSG_REQ_POOL_USAGE\n"));
 }