You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/02/09 14:20:09 UTC
svn commit: r1068879 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
mod_proxy_balancer.c proxy_util.c
Author: jim
Date: Wed Feb 9 13:20:09 2011
New Revision: 1068879
URL: http://svn.apache.org/viewvc?rev=1068879&view=rev
Log:
Ugg... unbalanced workers *do* need a mutex as well (good catch RĂ¼diger!)
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.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=1068879&r1=1068878&r2=1068879&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Wed Feb 9 13:20:09 2011
@@ -376,6 +376,7 @@ 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? */
+ apr_thread_mutex_t *tmutex; /* Thread lock for updating address cache */
void *context; /* general purpose storage */
};
@@ -413,7 +414,7 @@ struct proxy_balancer {
const char *sname; /* filesystem safe balancer name */
apr_time_t wupdated; /* timestamp of last change to workers list */
apr_global_mutex_t *gmutex; /* global lock for updating list of workers */
- apr_thread_mutex_t *tmutex; /* Thread lock for updating address cache and worker selection*/
+ apr_thread_mutex_t *tmutex; /* Thread lock for updating shm */
void *context; /* general purpose storage */
proxy_balancer_shared *s; /* Shared data */
};
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1068879&r1=1068878&r2=1068879&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Wed Feb 9 13:20:09 2011
@@ -1373,6 +1373,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_upd
(*runtime)->cp = NULL;
(*runtime)->balancer = b;
(*runtime)->s = shm;
+ (*runtime)->tmutex = NULL;
if ((rv = ap_proxy_initialize_worker(*runtime, s, conf->pool)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "Cannot init worker");
return rv;
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1068879&r1=1068878&r2=1068879&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Feb 9 13:20:09 2011
@@ -1467,7 +1467,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
rv = apr_thread_mutex_create(&(balancer->tmutex), APR_THREAD_MUTEX_DEFAULT, p);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "can not create thread mutex");
+ "can not create balancer thread mutex");
return rv;
}
}
@@ -1890,6 +1890,14 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
"initializing worker %s local", worker->s->name);
/* Now init local worker data */
+ if (worker->tmutex == NULL) {
+ rv = apr_thread_mutex_create(&(worker->tmutex), APR_THREAD_MUTEX_DEFAULT, p);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ "can not create worker thread mutex");
+ return rv;
+ }
+ }
if (worker->cp == NULL)
init_conn_pool(p, worker);
if (worker->cp == NULL) {
@@ -2293,7 +2301,7 @@ ap_proxy_determine_connection(apr_pool_t
conn->pool);
}
else if (!worker->cp->addr) {
- if ((err = PROXY_THREAD_LOCK(worker->balancer)) != APR_SUCCESS) {
+ if ((err = PROXY_THREAD_LOCK(worker)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server,
"proxy: lock");
return HTTP_INTERNAL_SERVER_ERROR;
@@ -2310,7 +2318,7 @@ ap_proxy_determine_connection(apr_pool_t
conn->port, 0,
worker->cp->pool);
conn->addr = worker->cp->addr;
- if ((uerr = PROXY_THREAD_UNLOCK(worker->balancer)) != APR_SUCCESS) {
+ if ((uerr = PROXY_THREAD_UNLOCK(worker)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, uerr, r->server,
"proxy: unlock");
}