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

Follow up to r1821526: style, no functional change.

Browse Source 
[Reverted by r1821619]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821539 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-01-18 18:35:20 +00:00
parent b31ba4c83c
commit d35f2f7675
2 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/mpm_unix.c
View File

@@ -1155,8 +1155,7 @@ static apr_status_t queue_info_cleanup(void *data_)
if (first_pool == NULL) { if (first_pool == NULL) {
break; break;
} }
if (apr_atomic_casptr if (apr_atomic_casptr((void *)&qi->recycled_pools, first_pool->next,
((void*) &(qi->recycled_pools), first_pool->next,
first_pool) == first_pool) { first_pool) == first_pool) {
apr_pool_destroy(first_pool->pool); apr_pool_destroy(first_pool->pool);
} }
@@ -1311,8 +1310,7 @@ apr_uint32_t ap_queue_info_get_idlers(fd_queue_info_t * queue_info)
return val - zero_pt; return val - zero_pt;
} }
void ap_push_pool(fd_queue_info_t * queue_info, void ap_push_pool(fd_queue_info_t *queue_info, apr_pool_t *pool_to_recycle)
apr_pool_t * pool_to_recycle)
{ {
struct recycled_pool *new_recycle; struct recycled_pool *new_recycle;
/* If we have been given a pool to recycle, atomically link /* If we have been given a pool to recycle, atomically link
@@ -1331,8 +1329,7 @@ void ap_push_pool(fd_queue_info_t * queue_info,
} }
apr_pool_clear(pool_to_recycle); apr_pool_clear(pool_to_recycle);
new_recycle = (struct recycled_pool *) apr_palloc(pool_to_recycle, new_recycle = apr_palloc(pool_to_recycle, sizeof *new_recycle);
sizeof (*new_recycle));
new_recycle->pool = pool_to_recycle; new_recycle->pool = pool_to_recycle;
for (;;) { for (;;) {
/* /*
@@ -1368,8 +1365,7 @@ void ap_pop_pool(apr_pool_t ** recycled_pool, fd_queue_info_t * queue_info)
if (first_pool == NULL) { if (first_pool == NULL) {
break; break;
} }
if (apr_atomic_casptr if (apr_atomic_casptr((void *)&queue_info->recycled_pools,
((void*) &(queue_info->recycled_pools),
first_pool->next, first_pool) == first_pool) { first_pool->next, first_pool) == first_pool) {
*recycled_pool = first_pool->pool; *recycled_pool = first_pool->pool;
if (queue_info->max_recycled_pools >= 0) if (queue_info->max_recycled_pools >= 0)

3
server/mpm_unix.h
View File

@@ -81,8 +81,7 @@ struct fd_queue_t
typedef struct fd_queue_t fd_queue_t; typedef struct fd_queue_t fd_queue_t;
void ap_pop_pool(apr_pool_t **recycled_pool, fd_queue_info_t *queue_info); void ap_pop_pool(apr_pool_t **recycled_pool, fd_queue_info_t *queue_info);
void ap_push_pool(fd_queue_info_t * queue_info, void ap_push_pool(fd_queue_info_t *queue_info, apr_pool_t *pool_to_recycle);
apr_pool_t * pool_to_recycle);
apr_status_t ap_queue_init(fd_queue_t *queue, int queue_capacity, apr_status_t ap_queue_init(fd_queue_t *queue, int queue_capacity,
apr_pool_t *a); apr_pool_t *a);