striker 01/12/18 10:55:39
Modified: include apr_pools.h
memory/unix apr_pools.c
Log:
Enable apr_pool_tag by default, instead of only when APR_POOL_DEBUG
is defined.
Suggested by: Jeff Trawick, Brian Pane
Revision Changes Path
1.65 +7 -12 apr/include/apr_pools.h
Index: apr_pools.h
===================================================================
RCS file: /home/cvs/apr/include/apr_pools.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- apr_pools.h 2001/12/14 02:16:55 1.64
+++ apr_pools.h 2001/12/18 18:55:39 1.65
@@ -181,13 +181,6 @@
APR_DECLARE(apr_size_t) apr_pool_free_blocks_num_bytes(void);
/**
- * Tag a pool (give it a name)
- * @param pool The pool to tag
- * @param tag The tag
- */
-APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag);
-
-/**
* Lock a pool
* @param pool The pool to lock
* @param flag The flag
@@ -202,16 +195,18 @@
# endif
# define apr_pool_join(a,b)
-# ifdef apr_pool_tag
-# undef apr_pool_tag
-# endif
-# define apr_pool_tag(pool, tag)
-
# ifdef apr_pool_lock
# undef apr_pool_lock
# endif
# define apr_pool_lock(pool, lock)
#endif
+
+/**
+ * Tag a pool (give it a name)
+ * @param pool The pool to tag
+ * @param tag The tag
+ */
+APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag);
/**
* Determine if pool a is an ancestor of pool b
1.124 +1 -7 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- apr_pools.c 2001/12/15 11:13:45 1.123
+++ apr_pools.c 2001/12/18 18:55:39 1.124
@@ -133,9 +133,7 @@
struct process_chain *subprocesses;
apr_abortfunc_t abort_fn;
apr_hash_t *user_data;
-#if defined(APR_POOL_DEBUG)
const char *tag;
-#endif
};
#define SIZEOF_NODE_T APR_ALIGN_DEFAULT(sizeof(node_t))
@@ -569,9 +567,7 @@
pool->cleanups = NULL;
pool->subprocesses = NULL;
pool->user_data = NULL;
-#if defined(APR_POOL_DEBUG)
pool->tag = NULL;
-#endif
#if APR_HAS_THREADS
if ((flags & APR_POOL_FLOCK) == APR_POOL_FLOCK) {
@@ -596,9 +592,7 @@
pool->cleanups = NULL;
pool->subprocesses = NULL;
pool->user_data = NULL;
-#if defined(APR_POOL_DEBUG)
pool->tag = NULL;
-#endif
}
if ((pool->parent = parent) != NULL) {
@@ -830,12 +824,12 @@
* Debug functions
*/
-#if defined(APR_POOL_DEBUG)
APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag)
{
pool->tag = tag;
}
+#if defined(APR_POOL_DEBUG)
APR_DECLARE(apr_size_t) apr_pool_num_bytes(apr_pool_t *p, int recurse)
{
return 0;
