You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/01/20 13:26:36 UTC
svn commit: r613542 - in /tomcat/connectors/trunk/jk/native:
apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_status.c
common/jk_uri_worker_map.c common/jk_uri_worker_map.h
Author: rjung
Date: Sun Jan 20 04:26:35 2008
New Revision: 613542
URL: http://svn.apache.org/viewvc?rev=613542&view=rev
Log:
Rename some of the new extension struct members to
make them more consistent with previous notation
resp. more future proof:
size -> activation_size
disable -> disabled
stop -> stopped
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=613542&r1=613541&r2=613542&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Jan 20 04:26:35 2008
@@ -647,8 +647,8 @@
if (e) {
s->extension.reply_timeout = e->reply_timeout;
if (e->activation) {
- s->extension.activation = ap_palloc(r->pool, e->size * sizeof(int));
- memcpy(s->extension.activation, e->activation, e->size * sizeof(int));
+ s->extension.activation = ap_palloc(r->pool, e->activation_size * sizeof(int));
+ memcpy(s->extension.activation, e->activation, e->activation_size * sizeof(int));
}
}
reply_timeout = ap_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=613542&r1=613541&r2=613542&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Jan 20 04:26:35 2008
@@ -659,8 +659,8 @@
if (e) {
s->extension.reply_timeout = e->reply_timeout;
if (e->activation) {
- s->extension.activation = apr_palloc(r->pool, e->size * sizeof(int));
- memcpy(s->extension.activation, e->activation, e->size * sizeof(int));
+ s->extension.activation = apr_palloc(r->pool, e->activation_size * sizeof(int));
+ memcpy(s->extension.activation, e->activation, e->activation_size * sizeof(int));
}
}
reply_timeout = apr_table_get(r->subprocess_env, "JK_REPLY_TIMEOUT");
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=613542&r1=613541&r2=613542&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 20 04:26:35 2008
@@ -1424,8 +1424,8 @@
uri_worker_map_get_source(uwr, l),
uwr->extensions.reply_timeout,
uwr->extensions.active ? uwr->extensions.active : "-",
- uwr->extensions.disable ? uwr->extensions.disable : "-",
- uwr->extensions.stop ? uwr->extensions.stop : "-");
+ uwr->extensions.disabled ? uwr->extensions.disabled : "-",
+ uwr->extensions.stopped ? uwr->extensions.stopped : "-");
else
jk_printf(s, JK_STATUS_URI_MAP_TABLE_ROW,
uwr->uri,
@@ -1433,8 +1433,8 @@
uri_worker_map_get_source(uwr, l),
uwr->extensions.reply_timeout,
uwr->extensions.active ? uwr->extensions.active : "-",
- uwr->extensions.disable ? uwr->extensions.disable : "-",
- uwr->extensions.stop ? uwr->extensions.stop : "-");
+ uwr->extensions.disabled ? uwr->extensions.disabled : "-",
+ uwr->extensions.stopped ? uwr->extensions.stopped : "-");
}
else if (mime == JK_STATUS_MIME_XML) {
jk_print_xml_start_elt(s, w, 6, 0, "map");
@@ -1446,8 +1446,8 @@
jk_print_xml_att_string(s, 8, "source", uri_worker_map_get_source(uwr, l));
jk_print_xml_att_int(s, 8, "reply_timeout", uwr->extensions.reply_timeout);
jk_print_xml_att_string(s, 8, "active", uwr->extensions.active);
- jk_print_xml_att_string(s, 8, "disabled", uwr->extensions.disable);
- jk_print_xml_att_string(s, 8, "stopped", uwr->extensions.stop);
+ jk_print_xml_att_string(s, 8, "disabled", uwr->extensions.disabled);
+ jk_print_xml_att_string(s, 8, "stopped", uwr->extensions.stopped);
jk_print_xml_stop_elt(s, 6, 1);
}
else if (mime == JK_STATUS_MIME_TXT) {
@@ -1460,8 +1460,8 @@
jk_printf(s, " source=\"%s\"", uri_worker_map_get_source(uwr, l));
jk_printf(s, " reply_timeout=\"%d\"", uwr->extensions.reply_timeout);
jk_printf(s, " active=\"%s\"", uwr->extensions.active);
- jk_printf(s, " disabled=\"%s\"", uwr->extensions.disable);
- jk_printf(s, " stopped=\"%s\"", uwr->extensions.stop);
+ jk_printf(s, " disabled=\"%s\"", uwr->extensions.disabled);
+ jk_printf(s, " stopped=\"%s\"", uwr->extensions.stopped);
jk_puts(s, "\n");
}
else if (mime == JK_STATUS_MIME_PROP) {
@@ -1472,8 +1472,8 @@
jk_print_prop_item_string(s, w, worker, "map", count, "source", uri_worker_map_get_source(uwr, l));
jk_print_prop_item_int(s, w, worker, "map", count, "reply_timeout", uwr->extensions.reply_timeout);
jk_print_prop_item_string(s, w, worker, "map", count, "active", uwr->extensions.active);
- jk_print_prop_item_string(s, w, worker, "map", count, "disabled", uwr->extensions.disable);
- jk_print_prop_item_string(s, w, worker, "map", count, "stopped", uwr->extensions.stop);
+ jk_print_prop_item_string(s, w, worker, "map", count, "disabled", uwr->extensions.disabled);
+ jk_print_prop_item_string(s, w, worker, "map", count, "stopped", uwr->extensions.stopped);
}
}
JK_TRACE_EXIT(l);
@@ -1523,10 +1523,10 @@
jk_puts(s, "]</h3><table>\n");
if (has_server_iterator)
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD2,
- "Server", "URI", "Match Type", "Source", "Reply Timeout", "Force Active", "Force Disabled", "Force Stopped");
+ "Server", "URI", "Match Type", "Source", "Reply Timeout", "Active", "Disabled", "Stopped");
else
jk_printf(s, JK_STATUS_URI_MAP_TABLE_HEAD,
- "URI", "Match Type", "Source", "Reply Timeout", "Force Active", "Force Disabled", "Force Stopped");
+ "URI", "Match Type", "Source", "Reply Timeout", "Active", "Disabled", "Stopped");
}
count = 0;
if (has_server_iterator) {
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=613542&r1=613541&r2=613542&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Jan 20 04:26:35 2008
@@ -41,8 +41,8 @@
#define JK_UWMAP_EXTENSION_REPLY_TIMEOUT "reply_timeout="
#define JK_UWMAP_EXTENSION_ACTIVE "active="
-#define JK_UWMAP_EXTENSION_DISABLE "disable="
-#define JK_UWMAP_EXTENSION_STOP "stop="
+#define JK_UWMAP_EXTENSION_DISABLED "disabled="
+#define JK_UWMAP_EXTENSION_STOPPED "stopped="
#define IND_THIS(x) ((x)[uw_map->index])
#define IND_NEXT(x) ((x)[(uw_map->index+1) % 2])
@@ -393,18 +393,18 @@
i, uwr->worker_name, wc_get_name_for_type(jw->type,l), jw->type);
if (jw->type == JK_LB_WORKER_TYPE &&
- (uwr->extensions.active || uwr->extensions.disable || uwr->extensions.stop)) {
+ (uwr->extensions.active || uwr->extensions.disabled || uwr->extensions.stopped)) {
int j;
lb_worker_t *lb = (lb_worker_t *)jw->worker_private;
jk_pool_t *p;
if (!uwr->extensions.activation) {
- uwr->extensions.size = lb->num_of_workers;
+ uwr->extensions.activation_size = lb->num_of_workers;
if (uwr->source_type == SOURCE_TYPE_URIMAP)
p = &IND_NEXT(uw_map->p_dyn);
else
p = &uw_map->p;
uwr->extensions.activation = (int *)jk_pool_alloc(p,
- uwr->extensions.size * sizeof(int));
+ uwr->extensions.activation_size * sizeof(int));
if (!uwr->extensions.activation) {
jk_log(l, JK_LOG_ERROR,
"can't alloc extensions activation list");
@@ -412,20 +412,20 @@
} else if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
"Allocated activations array of size %d for lb worker %s",
- uwr->extensions.size, uwr->worker_name);
- for (j=0; j<uwr->extensions.size; j++) {
+ uwr->extensions.activation_size, uwr->worker_name);
+ for (j=0; j<uwr->extensions.activation_size; j++) {
uwr->extensions.activation[j] = JK_LB_ACTIVATION_UNSET;
}
}
if (uwr->extensions.active)
extract_activation(lb, uwr->extensions.activation,
uwr->extensions.active, JK_LB_ACTIVATION_ACTIVE, l);
- if (uwr->extensions.disable)
+ if (uwr->extensions.disabled)
extract_activation(lb, uwr->extensions.activation,
- uwr->extensions.disable, JK_LB_ACTIVATION_DISABLED, l);
- if (uwr->extensions.stop)
+ uwr->extensions.disabled, JK_LB_ACTIVATION_DISABLED, l);
+ if (uwr->extensions.stopped)
extract_activation(lb, uwr->extensions.activation,
- uwr->extensions.stop, JK_LB_ACTIVATION_STOPPED, l);
+ uwr->extensions.stopped, JK_LB_ACTIVATION_STOPPED, l);
}
else if (uwr->extensions.active) {
jk_log(l, JK_LOG_WARNING,
@@ -433,17 +433,17 @@
JK_UWMAP_EXTENSION_ACTIVE " for %s ignored",
uwr->worker_name, uwr->extensions.active);
}
- else if (uwr->extensions.disable) {
+ else if (uwr->extensions.disabled) {
jk_log(l, JK_LOG_WARNING,
"Worker %s is not of type lb, activation extension "
- JK_UWMAP_EXTENSION_DISABLE " for %s ignored",
- uwr->worker_name, uwr->extensions.disable);
+ JK_UWMAP_EXTENSION_DISABLED " for %s ignored",
+ uwr->worker_name, uwr->extensions.disabled);
}
- else if (uwr->extensions.stop) {
+ else if (uwr->extensions.stopped) {
jk_log(l, JK_LOG_WARNING,
"Worker %s is not of type lb, activation extension "
- JK_UWMAP_EXTENSION_STOP " for %s ignored",
- uwr->worker_name, uwr->extensions.stop);
+ JK_UWMAP_EXTENSION_STOPPED " for %s ignored",
+ uwr->worker_name, uwr->extensions.stopped);
}
}
uw_map->index = (uw_map->index + 1) % 2;
@@ -513,9 +513,9 @@
w = jk_pool_strdup(p, worker);
uwr->extensions.reply_timeout = -1;
uwr->extensions.active = NULL;
- uwr->extensions.disable = NULL;
- uwr->extensions.stop = NULL;
- uwr->extensions.size = 0;
+ uwr->extensions.disabled = NULL;
+ uwr->extensions.stopped = NULL;
+ uwr->extensions.activation_size = 0;
uwr->extensions.activation = NULL;
#ifdef _MT_CODE_PTHREAD
@@ -535,23 +535,26 @@
else if (!strncmp(param, JK_UWMAP_EXTENSION_ACTIVE, strlen(JK_UWMAP_EXTENSION_ACTIVE))) {
if (uwr->extensions.active)
jk_log(l, JK_LOG_WARNING,
- "active extension in uriworker map only allowed once");
+ "extension '%s' in uri worker map only allowed once",
+ JK_UWMAP_EXTENSION_ACTIVE);
else
uwr->extensions.active = param + strlen(JK_UWMAP_EXTENSION_ACTIVE);
}
- else if (!strncmp(param, JK_UWMAP_EXTENSION_DISABLE, strlen(JK_UWMAP_EXTENSION_DISABLE))) {
- if (uwr->extensions.disable)
+ else if (!strncmp(param, JK_UWMAP_EXTENSION_DISABLED, strlen(JK_UWMAP_EXTENSION_DISABLED))) {
+ if (uwr->extensions.disabled)
jk_log(l, JK_LOG_WARNING,
- "disable extension in uriworker map only allowed once");
+ "extension '%s' in uri worker map only allowed once",
+ JK_UWMAP_EXTENSION_DISABLED);
else
- uwr->extensions.disable = param + strlen(JK_UWMAP_EXTENSION_DISABLE);
+ uwr->extensions.disabled = param + strlen(JK_UWMAP_EXTENSION_DISABLED);
}
- else if (!strncmp(param, JK_UWMAP_EXTENSION_STOP, strlen(JK_UWMAP_EXTENSION_STOP))) {
- if (uwr->extensions.stop)
+ else if (!strncmp(param, JK_UWMAP_EXTENSION_STOPPED, strlen(JK_UWMAP_EXTENSION_STOPPED))) {
+ if (uwr->extensions.stopped)
jk_log(l, JK_LOG_WARNING,
- "stop extension in uriworker map only allowed once");
+ "extension '%s' in uri worker map only allowed once",
+ JK_UWMAP_EXTENSION_STOPPED);
else
- uwr->extensions.stop = param + strlen(JK_UWMAP_EXTENSION_STOP);
+ uwr->extensions.stopped = param + strlen(JK_UWMAP_EXTENSION_STOPPED);
}
}
}
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h?rev=613542&r1=613541&r2=613542&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h Sun Jan 20 04:26:35 2008
@@ -75,13 +75,13 @@
int reply_timeout;
/* activation state overwrites for load balancers */
/* Number of elements in the array activations. */
- int size;
+ int activation_size;
/* Dynamically allocated array with one entry per lb member. */
int *activation;
/* Temporary storage for the original extension strings. */
char *active;
- char *disable;
- char *stop;
+ char *disabled;
+ char *stopped;
};
typedef struct rule_extension rule_extension_t;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org