Re: svn commit: r1852442 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h mod_proxy_balancer.c mod_proxy_ftp.c proxy_util.c

[Ruediger Pluem]

On 08/26/2019 03:54 PM, Eric Covener wrote:
> On Tue, Jan 29, 2019 at 7:28 AM  wrote:
>>
>> Author: stsp
>> Date: Tue Jan 29 12:28:35 2019
>> New Revision: 1852442
>>
>> URL: http://svn.apache.org/viewvc?rev=1852442&view=rev
>> Log:
>> Make proxy modules compile if APR_HAS_THREADS is not defined.
>>
>> Modified:
>> httpd/httpd/trunk/modules/proxy/mod_proxy.h
>> httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
>> httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
>> httpd/httpd/trunk/modules/proxy/proxy_util.c
>>
>> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
>> URL: 
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1852442&r1=1852441&r2=1852442&view=diff
>> ==
>> --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Tue Jan 29 12:28:35 2019
>> @@ -472,7 +472,9 @@ struct proxy_worker {
>>  proxy_conn_pool *cp;/* Connection pool to use */
>>  proxy_worker_shared   *s;   /* Shared data */
>>  proxy_balancer  *balancer;  /* which balancer am I in? */
>> +#if APR_HAS_THREADS
>>  apr_thread_mutex_t  *tmutex; /* Thread lock for updating address cache 
>> */
>> +#endif
>>  void*context;   /* general purpose storage */
>>  ap_conf_vector_t *section_config; /* -section wherein defined */
>>  };
>> @@ -528,8 +530,10 @@ struct proxy_balancer {
>>  proxy_hashes hash;
>>  apr_time_t  wupdated;/* timestamp of last change to workers 
>> list */
>>  proxy_balancer_method *lbmethod;
>> +#if APR_HAS_THREADS
>>  apr_global_mutex_t  *gmutex; /* global lock for updating list of 
>> workers */
>>  apr_thread_mutex_t  *tmutex; /* Thread lock for updating shm */
>> +#endif
> 
> Shouldn't the global mutex still be used for the cross-process lock?
> 

I would say yes.

Regards

Rüdiger

Re: svn commit: r1852442 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h mod_proxy_balancer.c mod_proxy_ftp.c proxy_util.c

[Eric Covener]

On Tue, Jan 29, 2019 at 7:28 AM  wrote:
>
> Author: stsp
> Date: Tue Jan 29 12:28:35 2019
> New Revision: 1852442
>
> URL: http://svn.apache.org/viewvc?rev=1852442&view=rev
> Log:
> Make proxy modules compile if APR_HAS_THREADS is not defined.
>
> Modified:
> httpd/httpd/trunk/modules/proxy/mod_proxy.h
> httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
> httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
> httpd/httpd/trunk/modules/proxy/proxy_util.c
>
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1852442&r1=1852441&r2=1852442&view=diff
> ==
> --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Tue Jan 29 12:28:35 2019
> @@ -472,7 +472,9 @@ struct proxy_worker {
>  proxy_conn_pool *cp;/* Connection pool to use */
>  proxy_worker_shared   *s;   /* Shared data */
>  proxy_balancer  *balancer;  /* which balancer am I in? */
> +#if APR_HAS_THREADS
>  apr_thread_mutex_t  *tmutex; /* Thread lock for updating address cache */
> +#endif
>  void*context;   /* general purpose storage */
>  ap_conf_vector_t *section_config; /* -section wherein defined */
>  };
> @@ -528,8 +530,10 @@ struct proxy_balancer {
>  proxy_hashes hash;
>  apr_time_t  wupdated;/* timestamp of last change to workers list 
> */
>  proxy_balancer_method *lbmethod;
> +#if APR_HAS_THREADS
>  apr_global_mutex_t  *gmutex; /* global lock for updating list of workers 
> */
>  apr_thread_mutex_t  *tmutex; /* Thread lock for updating shm */
> +#endif

Shouldn't the global mutex still be used for the cross-process lock?