diff options
| author | Branko Čibej <brane@apache.org> | 2015-04-24 23:04:54 +0000 |
|---|---|---|
| committer | Branko Čibej <brane@apache.org> | 2015-04-24 23:04:54 +0000 |
| commit | 86795c25bc32ecc56a10f632e73ab23e67202eb6 (patch) | |
| tree | 969612088a660adf6ee8b80d47f9e6be0f25e371 /memory/unix | |
| parent | 8c3422e7299173cf6d2a8835fd3caa458aae0564 (diff) | |
| download | apr-86795c25bc32ecc56a10f632e73ab23e67202eb6.tar.gz | |
Register the pool debug log cleanup handler after emitting the
global pool creation event. This ensures that the allocation
event from the cleanup registration written after the creation event.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1675982 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'memory/unix')
| -rw-r--r-- | memory/unix/apr_pools.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 6d02e1bdc..138180b77 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -1683,13 +1683,6 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void) file_stderr = debug_log; if (file_stderr) { - /* Add a cleanup handler that sets the debug log file handle - * to NULL, otherwise we'll try to log the global pool - * destruction event with predictably disastrous results. */ - apr_pool_cleanup_register(global_pool, NULL, - apr_pool_cleanup_file_stderr, - apr_pool_cleanup_null); - apr_file_printf(file_stderr, "POOL DEBUG: [PID" #if APR_HAS_THREADS @@ -1699,6 +1692,13 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void) "POOL \"TAG\" <__FILE__:__LINE__> PARENT (ALLOCS/TOTAL ALLOCS/CLEARS)\n"); apr_pool_log_event(global_pool, "GLOBAL", __FILE__ ":apr_pool_initialize", 0); + + /* Add a cleanup handler that sets the debug log file handle + * to NULL, otherwise we'll try to log the global pool + * destruction event with predictably disastrous results. */ + apr_pool_cleanup_register(global_pool, NULL, + apr_pool_cleanup_file_stderr, + apr_pool_cleanup_null); } #endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */ |