bnicholes 2004/02/02 13:39:11
Modified: memory/unix apr_pools.c
Log:
Move the NetWare memory pool cleanup code outside of the APR_POOL_DEBUG #if
so that the clean up will happen regardless of the debugging mode.
Submitted by: Jean-Jacques Clar [EMAIL PROTECTED]
Revision Changes Path
1.204 +23 -18 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- apr_pools.c 9 Dec 2003 17:43:01 -0000 1.203
+++ apr_pools.c 2 Feb 2004 21:39:11 -0000 1.204
@@ -596,24 +596,6 @@
global_allocator = NULL;
}
-#ifdef NETWARE
-void netware_pool_proc_cleanup ()
-{
- apr_pool_t *pool = global_pool->child;
- apr_os_proc_t owner_proc = (apr_os_proc_t)getnlmhandle();
-
- while (pool) {
- if (pool->owner_proc == owner_proc) {
- apr_pool_destroy (pool);
- pool = global_pool->child;
- }
- else {
- pool = pool->sibling;
- }
- }
- return;
-}
-#endif /* defined(NETWARE) */
/* Node list management helper macros; list_insert() inserts 'node'
* before 'point'. */
@@ -1566,6 +1548,10 @@
#if APR_HAS_THREADS
pool->owner = apr_os_thread_current();
#endif /* APR_HAS_THREADS */
+#ifdef NETWARE
+ pool->owner_proc = (apr_os_proc_t)getnlmhandle();
+#endif /* defined(NETWARE) */
+
if (parent == NULL || parent->allocator != allocator) {
#if APR_HAS_THREADS
@@ -1758,6 +1744,25 @@
}
#endif /* !APR_POOL_DEBUG */
+
+#ifdef NETWARE
+void netware_pool_proc_cleanup ()
+{
+ apr_pool_t *pool = global_pool->child;
+ apr_os_proc_t owner_proc = (apr_os_proc_t)getnlmhandle();
+
+ while (pool) {
+ if (pool->owner_proc == owner_proc) {
+ apr_pool_destroy (pool);
+ pool = global_pool->child;
+ }
+ else {
+ pool = pool->sibling;
+ }
+ }
+ return;
+}
+#endif /* defined(NETWARE) */
/*
