rbb 99/06/07 12:27:43
Modified: apr/include apr_lib.h
apr/lib apr_pools.c
apr/misc/unix start.c
Log:
I don't know how I missed converting this to use contexts.
Revision Changes Path
1.10 +2 -2 apache-apr/apr/include/apr_lib.h
Index: apr_lib.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_lib.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_lib.h 1999/06/07 13:21:43 1.9
+++ apr_lib.h 1999/06/07 19:27:30 1.10
@@ -226,8 +226,8 @@
* APR memory structure manipulators (pools, tables, and arrays).
*/
API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p);
-API_EXPORT(void) ap_clear_pool(ap_pool_t *p);
-API_EXPORT(void) ap_destroy_pool(ap_pool_t *p);
+API_EXPORT(void) ap_clear_pool(struct context_t *p);
+API_EXPORT(void) ap_destroy_pool(struct context_t *p);
API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p);
API_EXPORT(long) ap_bytes_in_free_blocks(void);
API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts);
1.7 +25 -25 apache-apr/apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/lib/apr_pools.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_pools.c 1999/06/02 18:44:37 1.6
+++ apr_pools.c 1999/06/07 19:27:35 1.7
@@ -530,65 +530,65 @@
return permanent_pool;
}
-API_EXPORT(void) ap_clear_pool(ap_pool_t *a)
+API_EXPORT(void) ap_clear_pool(struct context_t *a)
{
ap_block_alarms();
(void) ap_acquire_mutex(alloc_mutex);
- while (a->sub_pools) {
- ap_destroy_pool(a->sub_pools);
+ while (a->pool->sub_pools) {
+ ap_destroy_pool(a);
}
(void) ap_release_mutex(alloc_mutex);
/*
* Don't hold the mutex during cleanups.
*/
- run_cleanups(a->cleanups);
- a->cleanups = NULL;
- free_proc_chain(a->subprocesses);
- a->subprocesses = NULL;
- free_blocks(a->first->h.next);
- a->first->h.next = NULL;
-
- a->last = a->first;
- a->first->h.first_avail = a->free_first_avail;
- debug_fill(a->first->h.first_avail,
- a->first->h.endp - a->first->h.first_avail);
+ run_cleanups(a->pool->cleanups);
+ a->pool->cleanups = NULL;
+ free_proc_chain(a->pool->subprocesses);
+ a->pool->subprocesses = NULL;
+ free_blocks(a->pool->first->h.next);
+ a->pool->first->h.next = NULL;
+
+ a->pool->last = a->pool->first;
+ a->pool->first->h.first_avail = a->pool->free_first_avail;
+ debug_fill(a->pool->first->h.first_avail,
+ a->pool->first->h.endp - a->pool->first->h.first_avail);
#ifdef ALLOC_USE_MALLOC
{
void *c, *n;
- for (c = a->allocation_list; c; c = n) {
+ for (c = a->pool->allocation_list; c; c = n) {
n = *(void **)c;
free(c);
}
- a->allocation_list = NULL;
+ a->pool->allocation_list = NULL;
}
#endif
ap_unblock_alarms();
}
-API_EXPORT(void) ap_destroy_pool(ap_pool_t *a)
+API_EXPORT(void) ap_destroy_pool(struct context_t *a)
{
ap_block_alarms();
ap_clear_pool(a);
(void) ap_acquire_mutex(alloc_mutex);
- if (a->parent) {
- if (a->parent->sub_pools == a) {
- a->parent->sub_pools = a->sub_next;
+ if (a->pool->parent) {
+ if (a->pool->parent->sub_pools == a->pool) {
+ a->pool->parent->sub_pools = a->pool->sub_next;
}
- if (a->sub_prev) {
- a->sub_prev->sub_next = a->sub_next;
+ if (a->pool->sub_prev) {
+ a->pool->sub_prev->sub_next = a->pool->sub_next;
}
- if (a->sub_next) {
- a->sub_next->sub_prev = a->sub_prev;
+ if (a->pool->sub_next) {
+ a->pool->sub_next->sub_prev = a->pool->sub_prev;
}
}
(void) ap_release_mutex(alloc_mutex);
- free_blocks(a->first);
+ free_blocks(a->pool->first);
ap_unblock_alarms();
}
1.6 +1 -1 apache-apr/apr/misc/unix/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/misc/unix/start.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- start.c 1999/06/02 18:44:48 1.5
+++ start.c 1999/06/07 19:27:41 1.6
@@ -123,7 +123,7 @@
ap_status_t ap_destroy_context(struct context_t *cont)
{
- ap_destroy_pool(cont->pool);
+ ap_destroy_pool(cont);
return APR_SUCCESS;
}
