diff options
| author | Rainer Jung <rjung@apache.org> | 2019-07-17 11:43:04 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2019-07-17 11:43:04 +0000 |
| commit | fd7c95d2077cb0e566db80ad11bdd5cfb366c527 (patch) | |
| tree | 4484a2391a3a5773401b40909371ba47ff4d4c8b | |
| parent | 8d4811765362ae52b484aedcd6d9644b82e22e67 (diff) | |
| download | apr-fd7c95d2077cb0e566db80ad11bdd5cfb366c527.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.
Backport of r1674566 from trunk resp. r1863201 from 1.7.x.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1863210 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | memory/unix/apr_pools.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index cd6b17811..17fadb42a 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -1538,6 +1538,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(), @@ -1550,6 +1551,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 { @@ -1710,7 +1712,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); } |