www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:02:49 +03:00
Code Activity

Use the more traditional create/clear/destroy style for the main loop pool.

Browse Source 
Suggested by: jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@736809 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Paul Querna
2009-01-22 21:47:16 +00:00
parent 499757bc8e
commit e05e9c2d1a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cluster/mod_heartbeat.c
View File

@@ -120,6 +120,7 @@ static int hb_monitor(hb_ctx_t *ctx, apr_pool_t *p)
static void* APR_THREAD_FUNC hb_worker(apr_thread_t *thd, void *data) static void* APR_THREAD_FUNC hb_worker(apr_thread_t *thd, void *data)
{ {
apr_pool_t *tpool;
hb_ctx_t *ctx = (hb_ctx_t *) data; hb_ctx_t *ctx = (hb_ctx_t *) data;
apr_status_t rv; apr_status_t rv;
@@ -137,9 +138,10 @@ static void* APR_THREAD_FUNC hb_worker(apr_thread_t *thd, void *data)
apr_sleep(apr_time_from_msec(200)); apr_sleep(apr_time_from_msec(200));
} }
apr_pool_create(&tpool, pool);
while (ctx->keep_running) { while (ctx->keep_running) {
apr_pool_clear(tpool);
int mpm_state = 0; int mpm_state = 0;
apr_pool_t *tpool;
rv = ap_mpm_query(AP_MPMQ_MPM_STATE, &mpm_state); rv = ap_mpm_query(AP_MPMQ_MPM_STATE, &mpm_state);
@@ -152,13 +154,12 @@ static void* APR_THREAD_FUNC hb_worker(apr_thread_t *thd, void *data)
break; break;
} }
apr_pool_create(&tpool, pool);
apr_pool_tag(tpool, "heartbeat_worker_temp"); apr_pool_tag(tpool, "heartbeat_worker_temp");
hb_monitor(ctx, tpool); hb_monitor(ctx, tpool);
apr_pool_destroy(tpool);
apr_sleep(apr_time_from_sec(HEARTBEAT_INTERVAL)); apr_sleep(apr_time_from_sec(HEARTBEAT_INTERVAL));
} }
apr_pool_destroy(tpool);
apr_proc_mutex_unlock(ctx->mutex); apr_proc_mutex_unlock(ctx->mutex);
apr_thread_exit(ctx->thread, APR_SUCCESS); apr_thread_exit(ctx->thread, APR_SUCCESS);