Changeset 988 for vendor/current/source3/lib/tallocmsg.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/tallocmsg.c (modified) (3 diffs)

vendor/current/source3/lib/tallocmsg.c

@@ -19 +19 @@
 #include "includes.h"
 #include "messages.h"
-
-/**
- * @file tallocmsg.c
- *
- * Glue code between talloc profiling and the Samba messaging system.
- **/
-
-struct msg_pool_usage_state {
-        TALLOC_CTX *mem_ctx;
-        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(state->mem_ctx, &state->s, &state->len, &state->buflen,
-                               "%*sreference to: %s\n", depth*4, "", name);
-                return;
-        }
-
-        if (depth == 0) {
-                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),
-                               (unsigned long)talloc_total_blocks(ptr));
-                return;
-        }
-
-        if (strcmp(name, "char") == 0) {
-                /*
-                 * Print out the first 50 bytes of the string
-                 */
-                sprintf_append(state->mem_ctx, &state->s, &state->len,
-                               &state->buflen,
-                               "%*s%-30s contains %6lu bytes in %3lu blocks "
-                               "(ref %d): %*s\n", depth*4, "",
-                               name,
-                               (unsigned long)talloc_total_size(ptr),
-                               (unsigned long)talloc_total_blocks(ptr),
-                               talloc_reference_count(ptr),
-                               MIN(50, talloc_get_size(ptr)),
-                               (char *)ptr);
-                return;
-        }
-
-        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,
-                       (unsigned long)talloc_total_size(ptr),
-                       (unsigned long)talloc_total_blocks(ptr),
-                       talloc_reference_count(ptr));
-}
+#include "lib/util/talloc_report.h"
 
 /**
@@ -89 +31 @@
                            DATA_BLOB *data)
 {
-        struct msg_pool_usage_state state;
+        char *report;
 
         SMB_ASSERT(msg_type == MSG_REQ_POOL_USAGE);
@@ -95 +37 @@
         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;
+        report = talloc_report_str(msg_ctx, NULL);
 
-        talloc_report_depth_cb(NULL, 0, -1, msg_pool_usage_helper, &state);
-
-        if (!state.s) {
-                talloc_destroy(state.mem_ctx);
-                return;
+        if (report != NULL) {
+                messaging_send_buf(msg_ctx, src, MSG_POOL_USAGE,
+                                   (uint8_t *)report,
+                                   talloc_get_size(report)-1);
         }
 
-        messaging_send_buf(msg_ctx, src, MSG_POOL_USAGE,
-                           (uint8 *)state.s, strlen(state.s)+1);
-
-        talloc_destroy(state.mem_ctx);
+        talloc_free(report);
 }