June 2008 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r1662 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 09:39:42 -0400 (Thu, 05 Jun 2008) New Revision: 1662 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Fix the warnings when using -Wall -pedantic Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-05 13:03:07 UTC (rev 1661) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-05 13:39:42 UTC (rev 1662) @@ -77,6 +77,7 @@ if ((*worker) == NULL) { /* creates it */ + proxy_cluster_helper *helper; const char *err = ap_proxy_add_worker(worker, conf->pool, conf, url); if (err) { ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server, @@ -84,7 +85,7 @@ return; } (*worker)->opaque = apr_pcalloc(conf->pool, sizeof(proxy_cluster_helper)); - proxy_cluster_helper *helper = (*worker)->opaque; + helper = (*worker)->opaque; helper->count_active = 0; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "Created: worker for %s", url); @@ -201,6 +202,7 @@ static int remove_workers_node(nodeinfo_t *node, proxy_server_conf *conf, apr_pool_t *pool, server_rec *server) { int i; + proxy_cluster_helper *helper; proxy_worker *worker = (proxy_worker *)conf->workers->elts; for (i = 0; i < conf->workers->nelts; i++) { if (worker->id == node->mess.id) @@ -222,7 +224,7 @@ if (worker->cp->res) i = apr_reslist_acquired_count(worker->cp->res); #else - proxy_cluster_helper *helper = worker->opaque; + helper = worker->opaque; i = helper->count_active; #endif ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, @@ -345,7 +347,8 @@ if (conn->inreslist) { ap_log_perror(APLOG_MARK, APLOG_ERR, 0, conn->pool, "proxy: Pooled connection 0x%pp for worker %s has been" - " already returned to the connection pool.", conn, + " already returned to the connection pool.", + (void *) conn, worker->name); return APR_SUCCESS; } @@ -473,6 +476,8 @@ proxy_worker *worker) { nodeinfo_t *node; + int sizevhost, i; + int *vhosts; node_storage->read_node(worker->id, &node); @@ -481,10 +486,9 @@ * A node may have several virtual hosts and * each virtual hosts may have several context */ - int sizevhost = host_storage->get_max_size_host(); - int *vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost); + sizevhost = host_storage->get_max_size_host(); + vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost); sizevhost = host_storage->get_ids_used_host(vhosts); - int i; for (i=0; i<sizevhost; i++) { hostinfo_t *vhost; host_storage->read_host(vhosts[i], &vhost); @@ -492,10 +496,10 @@ /* XXX Check the virtual host */ /* Check the contexts */ + int j, len; int sizecontext = context_storage->get_max_size_context(); int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext); sizecontext = context_storage->get_ids_used_context(contexts); - int j; for (j=0; j<sizecontext; j++) { contextinfo_t *context; context_storage->read_context(contexts[j], &context); @@ -503,7 +507,7 @@ continue; /* check for /context[/] in the URL */ - int len = strlen(context->context); + len = strlen(context->context); if (strncmp(r->uri, context->context, len) == 0) { if (r->uri[len] == '\0' || r->uri[len] == '/') { /* Check status */ @@ -583,6 +587,10 @@ sizenode = node_storage->get_ids_used_node(nodes); for (n=0; n<sizenode; n++) { nodeinfo_t *node; + int i; + int sizevhost; + int *vhosts; + node_storage->read_node(nodes[n], &node); /* @@ -590,10 +598,9 @@ * A node may have several virtual hosts and * each virtual hosts may have several context */ - int sizevhost = host_storage->get_max_size_host(); - int *vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost); + sizevhost = host_storage->get_max_size_host(); + vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost); sizevhost = host_storage->get_ids_used_host(vhosts); - int i; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "get_context_host_balancer testing node %s", node->mess.JVMRoute); for (i=0; i<sizevhost; i++) { @@ -603,14 +610,15 @@ /* XXX Check the virtual host */ /* Check the contexts */ + int j; int sizecontext = context_storage->get_max_size_context(); int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext); sizecontext = context_storage->get_ids_used_context(contexts); - int j; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "get_context_host_balancer testing host %s", vhost->host); for (j=0; j<sizecontext; j++) { contextinfo_t *context; + int len; context_storage->read_context(contexts[j], &context); if (context->vhost != vhost->vhost) continue; @@ -618,7 +626,7 @@ "get_context_host_balancer testing context %s", context->context); /* check for /context[/] in the URL */ - int len = strlen(context->context); + len = strlen(context->context); if (strncmp(r->uri, context->context, len) == 0) { if (r->uri[len] == '\0' || r->uri[len] == '/') { /* Check status */ @@ -740,6 +748,7 @@ { apr_status_t rv; proxy_conn_rec *conn; + apr_interval_time_t timeout; /* get the proxy_conn_rec: from ap_proxy_acquire_connection */ #if APR_HAS_THREADS /* prefork() is not "safe" as we have now 2 threads... */ @@ -818,7 +827,7 @@ return rv; } - apr_interval_time_t timeout = worker->ping_timeout; + timeout = worker->ping_timeout; if (timeout <= 0) timeout = apr_time_from_sec(10); /* 10 seconds */ @@ -996,11 +1005,12 @@ */ static int proxy_cluster_trans(request_rec *r) { + char *balancer = get_context_host_balancer(r); + ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, r->server, "proxy_cluster_trans for %d %s %s uri: %s", r->proxyreq, r->filename, r->handler, r->uri); - char *balancer = get_context_host_balancer(r); if (balancer) { r->filename = apr_pstrcat(r->pool, "proxy:cluster://", balancer, r->uri, NULL); r->handler = "proxy-server"; @@ -1395,6 +1405,7 @@ { apr_status_t rv; + proxy_cluster_helper *helper; if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, @@ -1403,7 +1414,6 @@ return HTTP_INTERNAL_SERVER_ERROR; } /* mark the work as not use */ - proxy_cluster_helper *helper; helper = (proxy_cluster_helper *) worker->opaque; helper->count_active--;

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1661 - sandbox/httpd.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 09:03:07 -0400 (Thu, 05 Jun 2008) New Revision: 1661 Modified: sandbox/httpd/httpd.test Log: Add logic to compile the mod_cluster modules. Modified: sandbox/httpd/httpd.test =================================================================== --- sandbox/httpd/httpd.test 2008-06-05 12:10:07 UTC (rev 1660) +++ sandbox/httpd/httpd.test 2008-06-05 13:03:07 UTC (rev 1661) @@ -35,6 +35,7 @@ svn checkout http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk svn checkout http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x httpd-2.2.x svn checkout http://svn.apache.org/repos/asf/tomcat/connectors/trunk/jk jk-trunk +svn checkout http://anonsvn.jboss.org/repos/jbossweb/trunk/mod_cluster mod_cluster # build APR/APR-UTIL (cd apr-trunk @@ -139,6 +140,36 @@ fi # Build the mod_cluster modules with httpd-2.2.x +(cd mod_cluster/native/mod_proxy_cluster +./buildconf.sh +./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs +make clean +make +) +if [ $? -ne 0 ]; then + echo "Build mod_cluster/native/mod_proxy_cluster FAILED" + exit 1 +fi +(cd mod_cluster/native/mod_manager +./buildconf.sh +./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs +make clean +make +) +if [ $? -ne 0 ]; then + echo "Build mod_cluster/native/mod_manager FAILED" + exit 1 +fi +(cd mod_cluster/native/mod_slotmem +./buildconf.sh +./configure --with-apxs=$HOME/$TMPLOC/APACHE-2.2.x/bin/apxs +make clean +make +) +if [ $? -ne 0 ]; then + echo "Build mod_cluster/native/mod_slotmem FAILED" + exit 1 +fi # Test trunk (cd $HOME/$TMPLOC/APACHE

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1660 - trunk/mod_cluster/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 08:10:07 -0400 (Thu, 05 Jun 2008) New Revision: 1660 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c Log: Arrange warning on HP-UX. Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-06-05 12:03:49 UTC (rev 1659) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-06-05 12:10:07 UTC (rev 1660) @@ -164,6 +164,7 @@ server_rec *s = (server_rec *) data; mod_manager_config *mconf = ap_get_module_config(s->module_config, &manager_module); mconf->last_updated = apr_time_now(); + return (0); } static const struct node_storage_method node_storage = { @@ -1047,7 +1048,7 @@ char *errstring = NULL; int errtype = 0; char *buff; - int bufsiz=MAXMESSSIZE; + apr_size_t bufsiz=MAXMESSSIZE; apr_status_t status; if (strcmp(r->handler, "mod-cluster"))

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1659 - trunk/mod_cluster/native/mod_slotmem.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 08:03:49 -0400 (Thu, 05 Jun 2008) New Revision: 1659 Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c Log: replace void * by char *. Modified: trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c =================================================================== --- trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2008-06-05 11:51:16 UTC (rev 1658) +++ trunk/mod_cluster/native/mod_slotmem/sharedmem_util.c 2008-06-05 12:03:49 UTC (rev 1659) @@ -123,15 +123,12 @@ apr_status_t cleanup_slotmem(void *param) { ap_slotmem_t **mem = param; - apr_status_t rv; - apr_pool_t *pool = NULL; if (*mem) { ap_slotmem_t *next = *mem; - pool = next->globalpool; while (next) { store_slotmem(next); - rv = apr_shm_destroy(next->shm); + apr_shm_destroy(next->shm); /* XXX: remove the lock file ? */ next = next->next; } @@ -142,7 +139,7 @@ static apr_status_t ap_slotmem_do(ap_slotmem_t *mem, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool) { int i, j, isfree, *ident; - void *ptr; + char *ptr; apr_status_t rv; if (!mem) { @@ -172,7 +169,7 @@ static apr_status_t ap_slotmem_create(ap_slotmem_t **new, const char *name, apr_size_t item_size, int item_num, apr_pool_t *pool) { void *slotmem = NULL; - void *ptr; + char *ptr; struct sharedslotdesc desc; ap_slotmem_t *res; ap_slotmem_t *next = globallistmem; @@ -248,7 +245,7 @@ memcpy(ptr, &desc, sizeof(desc)); ptr = ptr + sizeof(desc); /* write the idents table */ - ident = ptr; + ident = (int *) ptr; for (i=0; i<item_num+1; i++) { ident[i] = i + 1; } @@ -267,7 +264,7 @@ /* For the chained slotmem stuff */ res->name = apr_pstrdup(globalpool, fname); - res->ident = ptr; + res->ident = (int *) ptr; res->base = ptr + sizeof(int) * (item_num + 1); res->size = item_size; res->num = item_num; @@ -286,7 +283,7 @@ static apr_status_t ap_slotmem_attach(ap_slotmem_t **new, const char *name, apr_size_t *item_size, int *item_num, apr_pool_t *pool) { void *slotmem = NULL; - void *ptr; + char *ptr; ap_slotmem_t *res; ap_slotmem_t *next = globallistmem; struct sharedslotdesc desc; @@ -340,7 +337,7 @@ /* For the chained slotmem stuff */ res->name = apr_pstrdup(globalpool, fname); - res->ident = ptr; + res->ident = (int *)ptr; res->base = ptr + sizeof(int) * (desc.item_num + 1); res->size = desc.item_size; res->num = desc.item_num; @@ -361,7 +358,7 @@ static apr_status_t ap_slotmem_mem(ap_slotmem_t *score, int id, void**mem) { - void *ptr; + char *ptr; int i; int *ident; @@ -379,7 +376,7 @@ return APR_NOTFOUND; } - ptr = score->base + score->size * (id - 1); + ptr = (char *) score->base + score->size * (id - 1); if (!ptr) { return APR_ENOSHMAVAIL; } @@ -408,7 +405,7 @@ ident[0] = ident[ff]; ident[ff] = 0; *item_id = ff; - *mem = score->base + score->size * (ff - 1); + *mem = (char *) score->base + score->size * (ff - 1); rv = APR_SUCCESS; }

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1658 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 07:51:16 -0400 (Thu, 05 Jun 2008) New Revision: 1658 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Fix the warnings on HP-UX. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-05 11:42:10 UTC (rev 1657) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-05 11:51:16 UTC (rev 1658) @@ -162,7 +162,7 @@ /* * Add a node to the worker conf */ -static int add_workers_node(nodeinfo_t *node, proxy_server_conf *conf, apr_pool_t *pool, server_rec *server) +static void add_workers_node(nodeinfo_t *node, proxy_server_conf *conf, apr_pool_t *pool, server_rec *server) { char *name = apr_pstrcat(pool, "cluster://", node->mess.balancer, NULL); proxy_balancer *balancer = ap_proxy_get_balancer(pool, conf, name); @@ -1020,11 +1020,9 @@ static int proxy_cluster_canon(request_rec *r, char *url) { if (strncasecmp(url, "balancer:", 9) == 0) { - OK; /* XXX: need more */ + return OK; /* XXX: need more */ } - else { - return DECLINED; - } + return DECLINED; } /* Find the worker that has the 'route' defined @@ -1447,10 +1445,12 @@ ap_register_provider(p, "proxy_cluster" , "balancer", "0", &balancerhandler); } +/* XXX: not needed static void *create_proxy_cluster_dir_config(apr_pool_t *p, char *dir) { return NULL; } + */ static void *create_proxy_cluster_server_config(apr_pool_t *p, server_rec *s) {

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1657 - sandbox/httpd.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 07:42:10 -0400 (Thu, 05 Jun 2008) New Revision: 1657 Modified: sandbox/httpd/httpd.test Log: Oops no need for ssl in those tests. Modified: sandbox/httpd/httpd.test =================================================================== --- sandbox/httpd/httpd.test 2008-06-05 11:36:35 UTC (rev 1656) +++ sandbox/httpd/httpd.test 2008-06-05 11:42:10 UTC (rev 1657) @@ -33,7 +33,7 @@ svn checkout http://svn.apache.org/repos/asf/apr/apr/trunk/ apr-trunk svn checkout http://svn.apache.org/repos/asf/apr/apr-util/trunk/ apr-util-trunk svn checkout http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk -svn checkout https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x httpd-2.2.x +svn checkout http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x httpd-2.2.x svn checkout http://svn.apache.org/repos/asf/tomcat/connectors/trunk/jk jk-trunk # build APR/APR-UTIL

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1656 - sandbox/httpd.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-05 07:36:35 -0400 (Thu, 05 Jun 2008) New Revision: 1656 Modified: sandbox/httpd/httpd.test Log: Add building httpd-2.2.x Modified: sandbox/httpd/httpd.test =================================================================== --- sandbox/httpd/httpd.test 2008-06-04 15:12:31 UTC (rev 1655) +++ sandbox/httpd/httpd.test 2008-06-05 11:36:35 UTC (rev 1656) @@ -33,6 +33,7 @@ svn checkout http://svn.apache.org/repos/asf/apr/apr/trunk/ apr-trunk svn checkout http://svn.apache.org/repos/asf/apr/apr-util/trunk/ apr-util-trunk svn checkout http://svn.apache.org/repos/asf/httpd/httpd/trunk httpd-trunk +svn checkout https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x httpd-2.2.x svn checkout http://svn.apache.org/repos/asf/tomcat/connectors/trunk/jk jk-trunk # build APR/APR-UTIL @@ -57,7 +58,7 @@ exit 1 fi -# build HTTPD +# build HTTPD trunk (cd httpd-trunk ./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk --with-apr-util=$HOME/$TMPLOC/apr-util-trunk ./configure --prefix=$HOME/$TMPLOC/APACHE \ @@ -87,6 +88,40 @@ if [ $? -ne 0 ]; then exit 1 fi + +# Build httpd 2.2.x +(cd httpd-2.2.x +./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk --with-apr-util=$HOME/$TMPLOC/apr-util-trunk +./configure --prefix=$HOME/$TMPLOC/APACHE-2.2.x \ + --with-apr=$HOME/$TMPLOC/APR \ + --with-apr-util=$HOME/$TMPLOC/APU \ + --enable-maintainer-mode \ + --enable-mods-shared=most \ + --with-ssl=$SSL_LOC \ + --with-port=7779 \ + --enable-ssl \ + --enable-proxy \ + --enable-proxy-http \ + --enable-proxy-ajp \ + --enable-proxy-balancer \ + --enable-proxy-cluster \ + --enable-sharedmem \ + --enable-mime-magic \ + --enable-file-cache \ + --enable-cache \ + --enable-disk-cache \ + --enable-mem-cache \ + +make clean +make +make install +) +if [ $? -ne 0 ]; then + exit 1 +fi + + +# Build mod_jk (cd jk-trunk/native ./buildconf.sh ./configure --with-apxs=$HOME/$TMPLOC/APACHE/bin/apxs @@ -102,6 +137,10 @@ echo "Build FAILED" exit 1 fi + +# Build the mod_cluster modules with httpd-2.2.x + +# Test trunk (cd $HOME/$TMPLOC/APACHE bin/apachectl start )

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1655 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-04 11:12:31 -0400 (Wed, 04 Jun 2008) New Revision: 1655 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: clean the connection if cping_cpong failed. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-04 14:15:36 UTC (rev 1654) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-04 15:12:31 UTC (rev 1655) @@ -828,7 +828,9 @@ if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_cluster_try_pingpong: cping_cpong failed"); + conn->close++; } + } ap_proxy_release_connection(scheme, conn, r->server); return rv;

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1654 - trunk/mod_cluster/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-04 10:15:36 -0400 (Wed, 04 Jun 2008) New Revision: 1654 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c Log: Check the return code of ap_get_brigade(). Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-06-04 14:14:25 UTC (rev 1653) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-06-04 14:15:36 UTC (rev 1654) @@ -69,6 +69,7 @@ #define SCMDUNS "SYNTAX: Command is not supported" #define SMULALB "SYNTAX: Only one Alias in APP command" #define SMULCTB "SYNTAX: Only one Context in APP command" +#define SREADER "SYNTAX: %s can't read POST data" #define TYPEMEM 2 #define MNODEUI "MEM: Can't update or insert node" @@ -1047,6 +1048,7 @@ int errtype = 0; char *buff; int bufsiz=MAXMESSSIZE; + apr_status_t status; if (strcmp(r->handler, "mod-cluster")) return DECLINED; @@ -1054,7 +1056,17 @@ /* Use a buffer to read the message */ buff = apr_pcalloc(r->pool, MAXMESSSIZE); input_brigade = apr_brigade_create(r->connection->pool, r->connection->bucket_alloc); - ap_get_brigade(r->input_filters, input_brigade, AP_MODE_READBYTES, APR_BLOCK_READ, MAXMESSSIZE); + status = ap_get_brigade(r->input_filters, input_brigade, AP_MODE_READBYTES, APR_BLOCK_READ, MAXMESSSIZE); + if (status != APR_SUCCESS) { + errstring = apr_psprintf(r->pool, SREADER, r->method); + r->status_line = apr_psprintf(r->pool, "ERROR"); + apr_table_setn(r->err_headers_out, "Version", VERSION_PROTOCOL); + apr_table_setn(r->err_headers_out, "Type", "SYNTAX"); + apr_table_setn(r->err_headers_out, "Mess", errstring); + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "manager_handler %s error: %s", r->method, errstring); + return 500; + } apr_brigade_flatten(input_brigade, buff, &bufsiz); buff[bufsiz] = '\0';

16 years, 7 months

1
0
0 / 0

JBoss Native SVN: r1653 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-06-04 10:14:25 -0400 (Wed, 04 Jun 2008) New Revision: 1653 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Use a counter in apr_reslist_acquired_count(). Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-03 20:34:37 UTC (rev 1652) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-04 14:14:25 UTC (rev 1653) @@ -45,6 +45,11 @@ #include "context.h" #include "balancer.h" +struct proxy_cluster_helper { + int count_active; /* currently active request using the worker */ +}; +typedef struct proxy_cluster_helper proxy_cluster_helper; + static struct node_storage_method *node_storage = NULL; static struct host_storage_method *host_storage = NULL; static struct context_storage_method *context_storage = NULL; @@ -69,7 +74,7 @@ strcat(url, node->mess.Port); *worker = ap_proxy_get_worker(conf->pool, conf, url); - if (*worker == NULL) { + if ((*worker) == NULL) { /* creates it */ const char *err = ap_proxy_add_worker(worker, conf->pool, conf, url); @@ -77,9 +82,12 @@ ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server, "Created: worker for %s failed: %s", url, err); return; + } + (*worker)->opaque = apr_pcalloc(conf->pool, sizeof(proxy_cluster_helper)); + proxy_cluster_helper *helper = (*worker)->opaque; + helper->count_active = 0; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "Created: worker for %s", url); - } } else if ((*worker)->id == 0) { /* We are going to reuse a removed one */ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, @@ -88,6 +96,7 @@ } else { return; /* Done Already existing */ } + /* Get the shared memory for this worker */ ptr = (char *) node; ptr = ptr + node->offset; @@ -208,8 +217,14 @@ /* apr_reslist_acquired_count */ i = 0; + +#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3) if (worker->cp->res) i = apr_reslist_acquired_count(worker->cp->res); +#else + proxy_cluster_helper *helper = worker->opaque; + i = helper->count_active; +#endif ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "remove_workers_node %d", i); if (i == 0) { @@ -702,6 +717,13 @@ cur_lbset++; } while (cur_lbset <= max_lbset && !mycandidate); + if (mycandidate) { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy: bytraffic balancer DONE (%s)", mycandidate->name); + } else { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy: bytraffic balancer FAILED"); + } return mycandidate; } static const proxy_balancer_method bytraffic = @@ -1138,8 +1160,12 @@ candidate = (*balancer->lbmethod->finder)(balancer, r); - if (candidate) - candidate->s->elected++; + if (candidate) { + proxy_cluster_helper *helper; + candidate->s->elected++; /* mark it in use */ + helper = (proxy_cluster_helper *) candidate->opaque; + helper->count_active++; + } if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, @@ -1296,6 +1322,12 @@ } } + /* Mark the worker used for the cleanup logic */ + if (*worker) { + proxy_cluster_helper *helper; + helper = (proxy_cluster_helper *) (*worker)->opaque; + helper->count_active++; + } if ((rv = PROXY_THREAD_UNLOCK(*balancer)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, "proxy: CLUSTER: (%s). Unlock failed for pre_request", @@ -1356,6 +1388,36 @@ return access_status; } +static int proxy_cluster_post_request(proxy_worker *worker, + proxy_balancer *balancer, + request_rec *r, + proxy_server_conf *conf) +{ + + apr_status_t rv; + + if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, + "proxy: CLUSTER: (%s). Lock failed for post_request", + balancer->name); + return HTTP_INTERNAL_SERVER_ERROR; + } + /* mark the work as not use */ + proxy_cluster_helper *helper; + helper = (proxy_cluster_helper *) worker->opaque; + helper->count_active--; + + if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, + "proxy: CLUSTER: (%s). Unlock failed for post_request", + balancer->name); + } + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy_cluster_post_request for (%s)", balancer->name); + + return OK; +} + /* * Register the hooks on our module. */ @@ -1378,6 +1440,7 @@ proxy_hook_canon_handler(proxy_cluster_canon, NULL, NULL, APR_HOOK_FIRST); proxy_hook_pre_request(proxy_cluster_pre_request, NULL, NULL, APR_HOOK_FIRST); + proxy_hook_post_request(proxy_cluster_post_request, NULL, NULL, APR_HOOK_FIRST); ap_register_provider(p, "proxy_cluster" , "balancer", "0", &balancerhandler); }

16 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits June 2008