summaryrefslogtreecommitdiff
path: root/memory
diff options
context:
space:
mode:
authorSander Striker <striker@apache.org>2015-04-18 19:14:19 +0000
committerSander Striker <striker@apache.org>2015-04-18 19:14:19 +0000
commit47c1ad841ed0e21c2a119fb9b848946a6fda38cb (patch)
treef4bbab79b6f527da770ee4d8ba985a2aa5e707ec /memory
parentb04bac484410851319c44463b87c1d15f8bbc455 (diff)
downloadapr-47c1ad841ed0e21c2a119fb9b848946a6fda38cb.tar.gz
Expand apr pools debug output with parent information.
* memory/unix/apr_pools.c (apr_pool_initialize): Add parent to debug header. (apr_pool_log_event): Add parent to debug output. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1674566 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory')
-rw-r--r--memory/unix/apr_pools.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 8c1b2a48e..eb83d9d66 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -1501,6 +1501,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
"(%10lu/%10lu/%10lu) "
"0x%pp \"%s\" "
"<%s> "
+ "0x%pp "
"(%u/%u/%u) "
"\n",
(unsigned long)getpid(),
@@ -1513,6 +1514,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
(unsigned long)apr_pool_num_bytes(global_pool, 1),
pool, pool->tag,
file_line,
+ pool->parent,
pool->stat_alloc, pool->stat_total_alloc, pool->stat_clear);
}
else {
@@ -1681,7 +1683,7 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void)
"/TID"
#endif /* APR_HAS_THREADS */
"] ACTION (SIZE /POOL SIZE /TOTAL SIZE) "
- "POOL \"TAG\" <__FILE__:__LINE__> (ALLOCS/TOTAL ALLOCS/CLEARS)\n");
+ "POOL \"TAG\" <__FILE__:__LINE__> PARENT (ALLOCS/TOTAL ALLOCS/CLEARS)\n");
apr_pool_log_event(global_pool, "GLOBAL", __FILE__ ":apr_pool_initialize", 0);
}