You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Eric Covener <co...@gmail.com> on 2014/11/23 00:25:23 UTC

Re: svn commit: r1640031 - in /httpd/httpd/trunk/server/mpm: event/event.c event/fdqueue.c eventopt/eventopt.c eventopt/fdqueue.c

On Sun, Nov 16, 2014 at 4:32 PM,  <yl...@apache.org> wrote:
> @@ -1010,8 +1003,6 @@ static void process_socket(apr_thread_t
>          c = ap_run_create_connection(p, ap_server_conf, sock,
>                                       conn_id, sbh, cs->bucket_alloc);
>          if (!c) {
> -            apr_bucket_alloc_destroy(cs->bucket_alloc);
> -            apr_pool_clear(p);
>              ap_push_pool(worker_queue_info, p);
>              return;
>          }

first line intentional?

Re: svn commit: r1640031 - in /httpd/httpd/trunk/server/mpm: event/event.c event/fdqueue.c eventopt/eventopt.c eventopt/fdqueue.c

Posted by Yann Ylavic <yl...@gmail.com>.
On Sun, Nov 23, 2014 at 12:25 AM, Eric Covener <co...@gmail.com> wrote:
> On Sun, Nov 16, 2014 at 4:32 PM,  <yl...@apache.org> wrote:
>> @@ -1010,8 +1003,6 @@ static void process_socket(apr_thread_t
>>          c = ap_run_create_connection(p, ap_server_conf, sock,
>>                                       conn_id, sbh, cs->bucket_alloc);
>>          if (!c) {
>> -            apr_bucket_alloc_destroy(cs->bucket_alloc);
>> -            apr_pool_clear(p);
>>              ap_push_pool(worker_queue_info, p);
>>              return;
>>          }
>
> first line intentional?

Yes, bucket_alloc is created on p just above, we can let it die when p
is cleared/destroyed in ap_push_pool().
This saves apr_bucket_alloc_destroy()'s walk/compare on p->cleanups
before apr_pool_clear().