Mailing List Archive

Re: svn commit: r1893563 - in /httpd/httpd/trunk/modules/http2: h2_version.h h2_workers.c
On 9/23/21 3:44 PM, icing@apache.org wrote:
> Author: icing
> Date: Thu Sep 23 13:44:58 2021
> New Revision: 1893563
>
> URL: http://svn.apache.org/viewvc?rev=1893563&view=rev
> Log:
> * mod_http2: fix version suffix after sync with github
> Make shutdown worker wait loop robust against timed wait
> interruptions and report the correct seconds waited.
>
>
> Modified:
> httpd/httpd/trunk/modules/http2/h2_version.h
> httpd/httpd/trunk/modules/http2/h2_workers.c
>

> Modified: httpd/httpd/trunk/modules/http2/h2_workers.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_workers.c?rev=1893563&r1=1893562&r2=1893563&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/http2/h2_workers.c (original)
> +++ httpd/httpd/trunk/modules/http2/h2_workers.c Thu Sep 23 13:44:58 2021
> @@ -319,9 +319,9 @@ static void workers_abort_idle(h2_worker
> static apr_status_t workers_pool_cleanup(void *data)
> {
> h2_workers *workers = data;
> - apr_time_t timout = apr_time_from_sec(1);
> + apr_time_t end, timout = apr_time_from_sec(1);

timeout instead of timout ? :-)

> apr_status_t rv;
> - int i, n = 5;
> + int n, wait_sec = 5;
>
> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, workers->s,
> "h2_workers: cleanup %d workers idling",


Regards

RĂ¼diger
Re: svn commit: r1893563 - in /httpd/httpd/trunk/modules/http2: h2_version.h h2_workers.c [ In reply to ]
> Am 23.09.2021 um 15:51 schrieb Ruediger Pluem <rpluem@apache.org>:
>
>
>
> On 9/23/21 3:44 PM, icing@apache.org wrote:
>> Author: icing
>> Date: Thu Sep 23 13:44:58 2021
>> New Revision: 1893563
>>
>> URL: http://svn.apache.org/viewvc?rev=1893563&view=rev
>> Log:
>> * mod_http2: fix version suffix after sync with github
>> Make shutdown worker wait loop robust against timed wait
>> interruptions and report the correct seconds waited.
>>
>>
>> Modified:
>> httpd/httpd/trunk/modules/http2/h2_version.h
>> httpd/httpd/trunk/modules/http2/h2_workers.c
>>
>
>> Modified: httpd/httpd/trunk/modules/http2/h2_workers.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_workers.c?rev=1893563&r1=1893562&r2=1893563&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/http2/h2_workers.c (original)
>> +++ httpd/httpd/trunk/modules/http2/h2_workers.c Thu Sep 23 13:44:58 2021
>> @@ -319,9 +319,9 @@ static void workers_abort_idle(h2_worker
>> static apr_status_t workers_pool_cleanup(void *data)
>> {
>> h2_workers *workers = data;
>> - apr_time_t timout = apr_time_from_sec(1);
>> + apr_time_t end, timout = apr_time_from_sec(1);
>
> timeout instead of timout ? :-)

It's a short timeout. ;-)

>
>> apr_status_t rv;
>> - int i, n = 5;
>> + int n, wait_sec = 5;
>>
>> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, workers->s,
>> "h2_workers: cleanup %d workers idling",
>
>
> Regards
>
> RĂ¼diger
Re: svn commit: r1893563 - in /httpd/httpd/trunk/modules/http2: h2_version.h h2_workers.c [ In reply to ]
Stefan,

On 9/23/21 09:52, stefan@eissing.org wrote:
>
>
>> Am 23.09.2021 um 15:51 schrieb Ruediger Pluem <rpluem@apache.org>:
>>
>>
>>
>> On 9/23/21 3:44 PM, icing@apache.org wrote:
>>> Author: icing
>>> Date: Thu Sep 23 13:44:58 2021
>>> New Revision: 1893563
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1893563&view=rev
>>> Log:
>>> * mod_http2: fix version suffix after sync with github
>>> Make shutdown worker wait loop robust against timed wait
>>> interruptions and report the correct seconds waited.
>>>
>>>
>>> Modified:
>>> httpd/httpd/trunk/modules/http2/h2_version.h
>>> httpd/httpd/trunk/modules/http2/h2_workers.c
>>>
>>
>>> Modified: httpd/httpd/trunk/modules/http2/h2_workers.c
>>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_workers.c?rev=1893563&r1=1893562&r2=1893563&view=diff
>>> ==============================================================================
>>> --- httpd/httpd/trunk/modules/http2/h2_workers.c (original)
>>> +++ httpd/httpd/trunk/modules/http2/h2_workers.c Thu Sep 23 13:44:58 2021
>>> @@ -319,9 +319,9 @@ static void workers_abort_idle(h2_worker
>>> static apr_status_t workers_pool_cleanup(void *data)
>>> {
>>> h2_workers *workers = data;
>>> - apr_time_t timout = apr_time_from_sec(1);
>>> + apr_time_t end, timout = apr_time_from_sec(1);
>>
>> timeout instead of timout ? :-)
>
> It's a short timeout. ;-)

No it's not: apt_time_t is a 64-bit value, so it's a long long timeout. ;)

-chris