cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c jk_util.h
mturk 2005/02/16 00:23:56
Modified:jk/native/common jk_util.c jk_util.h
Log:
Removed local_worker and local_worker_only.
Added sticky_session_force, redirect and lb method.
Revision ChangesPath
1.56 +24 -16jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- jk_util.c 14 Feb 2005 07:57:41 - 1.55
+++ jk_util.c 16 Feb 2005 08:23:56 - 1.56
@@ -26,6 +26,7 @@
#include jk_ajp12_worker.h
#include jk_ajp13_worker.h
#include jk_ajp14_worker.h
+#include jk_lb_worker.h
#include jk_mt.h
#define SYSPROPS_OF_WORKER (sysprops)
@@ -59,10 +60,11 @@
#define BALANCED_WORKERS(balanced_workers)
#define BALANCE_WORKERS (balance_workers)
#define STICKY_SESSION (sticky_session)
-#define LOCAL_WORKER_ONLY_FLAG (local_worker_only)
-#define LOCAL_WORKER_FLAG (local_worker)
+#define STICKY_SESSION_FORCE(sticky_session_force)
#define DOMAIN_OF_WORKER(domain)
+#define REDIRECT_OF_WORKER (redirect)
#define MOUNT_OF_WORKER (mount)
+#define METHOD_OF_WORKER(method)
#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER(secretkey)
@@ -363,6 +365,16 @@
return jk_map_get_string(m, buf, def);
}
+const char *jk_get_worker_redirect(jk_map_t *m, const char *wname, const
char *def)
+{
+char buf[1024];
+if (!m || !wname) {
+return NULL;
+}
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, REDIRECT_OF_WORKER);
+return jk_map_get_string(m, buf, def);
+}
+
const char *jk_get_worker_secret(jk_map_t *m, const char *wname)
{
char buf[1024];
@@ -441,7 +453,7 @@
static int def_cache_size = -1;
int jk_get_worker_def_cache_size(int protocol)
{
-if (def_cache_size 0) {
+if (def_cache_size 1) {
if (protocol == AJP14_PROTO)
def_cache_size = AJP14_DEF_CACHE_SZ;
else
@@ -660,13 +672,13 @@
return rc;
}
-int jk_get_is_local_worker(jk_map_t *m, const char *wname)
+int jk_get_is_sticky_session_force(jk_map_t *m, const char *wname)
{
int rc = JK_FALSE;
char buf[1024];
if (m wname) {
int value;
-sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, LOCAL_WORKER_FLAG);
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
STICKY_SESSION_FORCE);
value = jk_map_get_bool(m, buf, 0);
if (value)
rc = JK_TRUE;
@@ -674,19 +686,15 @@
return rc;
}
-int jk_get_local_worker_only_flag(jk_map_t *m, const char *lb_wname)
+int jk_get_lb_method(jk_map_t *m, const char *wname)
{
-int rc = JK_FALSE;
char buf[1024];
-if (m lb_wname) {
-int value;
-sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, lb_wname,
-LOCAL_WORKER_ONLY_FLAG);
-value = jk_map_get_bool(m, buf, 0);
-if (value)
-rc = JK_TRUE;
+if (!m || !wname) {
+return DEFAULT_LB_FACTOR;
}
-return rc;
+
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, METHOD_OF_WORKER);
+return jk_map_get_int(m, buf, JK_LB_BYREQUESTS);
}
int jk_get_lb_worker_list(jk_map_t *m,
1.26 +5 -3 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_util.h 12 Feb 2005 19:26:42 - 1.25
+++ jk_util.h 16 Feb 2005 08:23:56 - 1.26
@@ -72,6 +72,8 @@
const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char
*def);
+const char *jk_get_worker_redirect(jk_map_t *m, const char *wname, const
char *def);
+
const char *jk_get_worker_secret_key(jk_map_t *m, const char *wname);
int jk_get_worker_retries(jk_map_t *m, const char *wname, int def);
@@ -84,9 +86,9 @@
int jk_get_is_sticky_session(jk_map_t *m, const char *wname);
-int jk_get_is_local_worker(jk_map_t *m, const char *wname);
+int jk_get_is_sticky_session_force(jk_map_t *m, const char *wname);
-int jk_get_local_worker_only_flag(jk_map_t *m, const char *lb_wname);
+int jk_get_lb_method(jk_map_t *m, const char *wname);
int jk_get_lb_worker_list(jk_map_t *m,
const char *lb_wname,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c jk_util.h
mturk 2005/02/16 23:07:51
Modified:jk/native/common jk_util.c jk_util.h
Log:
Added socket_buf for optimizing socket receive and transmit buffers
for platforms that can use them.
Revision ChangesPath
1.60 +19 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jk_util.c 16 Feb 2005 12:07:28 - 1.59
+++ jk_util.c 17 Feb 2005 07:07:50 - 1.60
@@ -53,6 +53,7 @@
#define PREPOST_TIMEOUT_OF_WORKER (prepost_timeout)
#define REPLY_TIMEOUT_OF_WORKER (reply_timeout)
#define SOCKET_TIMEOUT_OF_WORKER(socket_timeout)
+#define SOCKET_BUFFER_OF_WORKER (socket_buffer)
#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
#define RECYCLE_TIMEOUT_OF_WORKER (recycle_timeout)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
@@ -495,6 +496,23 @@
return jk_map_get_int(m, buf, def);
}
+int jk_get_worker_socket_buffer(jk_map_t *m, const char *wname, int def)
+{
+char buf[1024];
+int i;
+if (!m || !wname) {
+return -1;
+}
+
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
+SOCKET_BUFFER_OF_WORKER);
+
+i = jk_map_get_int(m, buf, 0);
+if (i 0 i def)
+i = def;
+return i;
+}
+
int jk_get_worker_socket_keepalive(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
1.28 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_util.h 16 Feb 2005 09:25:35 - 1.27
+++ jk_util.h 17 Feb 2005 07:07:51 - 1.28
@@ -56,6 +56,8 @@
int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def);
+int jk_get_worker_socket_buffer(jk_map_t *m, const char *wname, int def);
+
int jk_get_worker_socket_keepalive(jk_map_t *m, const char *wname, int def);
int jk_get_worker_cache_timeout(jk_map_t *m, const char *wname, int def);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c jk_util.h
mturk 2005/02/12 11:26:42
Modified:jk/native/common jk_util.c jk_util.h
Log:
Add mount directive for worker as mount list. This will enable to get
rid of uriworkermap.properties as well as using dynamic config.
Revision ChangesPath
1.54 +26 -2 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_util.c 6 Feb 2005 17:43:09 - 1.53
+++ jk_util.c 12 Feb 2005 19:26:41 - 1.54
@@ -62,6 +62,7 @@
#define LOCAL_WORKER_ONLY_FLAG (local_worker_only)
#define LOCAL_WORKER_FLAG (local_worker)
#define DOMAIN_OF_WORKER(domain)
+#define MOUNT_OF_WORKER (mount)
#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER(secretkey)
@@ -690,7 +691,7 @@
int jk_get_lb_worker_list(jk_map_t *m,
const char *lb_wname,
- char ***list, unsigned *num_of_wokers)
+ char ***list, unsigned int *num_of_wokers)
{
char buf[1024];
@@ -719,6 +720,29 @@
return JK_FALSE;
}
+int jk_get_worker_mount_list(jk_map_t *m,
+ const char *wname,
+ char ***list, unsigned int *num_of_maps)
+{
+char buf[1024];
+
+if (m list num_of_maps wname) {
+char **ar = NULL;
+
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
+MOUNT_OF_WORKER);
+ar = jk_map_get_string_list(m, buf, num_of_maps, NULL);
+if (ar) {
+*list = ar;
+return JK_TRUE;
+}
+*list = NULL;
+*num_of_maps = 0;
+}
+
+return JK_FALSE;
+}
+
int jk_get_worker_mx(jk_map_t *m, const char *wname, unsigned *mx)
{
char buf[1024];
1.25 +5 -3 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_util.h 6 Feb 2005 13:30:34 - 1.24
+++ jk_util.h 12 Feb 2005 19:26:42 - 1.25
@@ -90,8 +90,10 @@
int jk_get_lb_worker_list(jk_map_t *m,
const char *lb_wname,
- char ***list, unsigned *num_of_wokers);
-
+ char ***list, unsigned int *num_of_wokers);
+int jk_get_worker_mount_list(jk_map_t *m,
+ const char *wname,
+ char ***list, unsigned int *num_of_maps);
const char *jk_get_worker_secret(jk_map_t *m, const char *wname);
int jk_get_worker_mx(jk_map_t *m, const char *wname, unsigned *mx);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c jk_util.h
mturk 2004/12/17 00:31:25
Modified:jk/native/common jk_util.c jk_util.h
Log:
Add setter and getter for default cache size.
It is implemented on Apache2 for now, and will set default cache size
acording to number of thread per child
Revision ChangesPath
1.50 +18 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- jk_util.c 13 Dec 2004 07:51:28 - 1.49
+++ jk_util.c 17 Dec 2004 08:31:25 - 1.50
@@ -438,6 +438,23 @@
return jk_map_get_int(m, buf, def);
}
+static int def_cache_size = -1;
+int jk_get_worker_def_cache_size(int protocol)
+{
+if (def_cache_size 0) {
+if (protocol == AJP14_PROTO)
+def_cache_size = AJP14_DEF_CACHE_SZ;
+else
+def_cache_size = AJP13_DEF_CACHE_SZ;
+}
+return def_cache_size;
+}
+
+void jk_set_worker_def_cache_size(int sz)
+{
+def_cache_size = sz;
+}
+
int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
1.23 +5 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_util.h 7 Dec 2004 12:24:53 - 1.22
+++ jk_util.h 17 Dec 2004 08:31:25 - 1.23
@@ -131,6 +131,10 @@
void jk_init_ws_service(jk_ws_service_t *s);
+void jk_set_worker_def_cache_size(int sz);
+
+int jk_get_worker_def_cache_size(int protocol);
+
#define TC32_BRIDGE_TYPE32
#define TC33_BRIDGE_TYPE33
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c jk_util.h jk_ajp_common.h jk_ajp_common.c
hgomez 2004/02/17 02:36:01
Modified:jk/native/common jk_util.c jk_util.h jk_ajp_common.h
jk_ajp_common.c
Log:
Make recovery scheme configurable :
- We could abort recovery if tomcat failed after receiving request or
if tomcat failed after send headers. (For now we keep the default
behaviour, recover allways)
Revision ChangesPath
1.26 +17 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_util.c 5 Nov 2003 09:15:39 - 1.25
+++ jk_util.c 17 Feb 2004 10:36:00 - 1.26
@@ -85,6 +85,7 @@
#define TYPE_OF_WORKER (type)
#define CACHE_OF_WORKER (cachesize)
#define CACHE_TIMEOUT_OF_WORKER (cache_timeout)
+#define RECOVERY_OPTS_OF_WORKER (recovery_options)
#define CONNECT_TIMEOUT_OF_WORKER(connect_timeout)
#define PREPOST_TIMEOUT_OF_WORKER(prepost_timeout)
#define REPLY_TIMEOUT_OF_WORKER (reply_timeout)
@@ -488,6 +489,21 @@
}
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, REPLY_TIMEOUT_OF_WORKER);
+
+return map_get_int(m, buf, def);
+}
+
+int jk_get_worker_recovery_opts(jk_map_t *m,
+const char *wname,
+int def)
+{
+char buf[1024];
+
+if(!m || !wname) {
+return -1;
+}
+
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, RECOVERY_OPTS_OF_WORKER);
return map_get_int(m, buf, def);
}
1.15 +5 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_util.h 4 Feb 2004 16:37:06 - 1.14
+++ jk_util.h 17 Feb 2004 10:36:00 - 1.15
@@ -122,6 +122,10 @@
const char *wname,
int def);
+int jk_get_worker_recovery_opts(jk_map_t *m,
+ const char *wname,
+ int def);
+
int jk_get_worker_connect_timeout(jk_map_t *m,
const char *wname,
int def);
1.22 +12 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
Index: jk_ajp_common.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_ajp_common.h 5 Nov 2003 09:15:39 - 1.21
+++ jk_ajp_common.h 17 Feb 2004 10:36:00 - 1.22
@@ -232,6 +232,12 @@
#define AJP_DEF_CONNECT_TIMEOUT (0)/* NO CONNECTION TIMEOUT = NO
CPING/CPONG */
#define AJP_DEF_REPLY_TIMEOUT (0)/* NO REPLY TIMEOUT
*/
#define AJP_DEF_PREPOST_TIMEOUT (0)/* NO PREPOST TIMEOUT = NO
CPING/CPONG*/
+#define AJP_DEF_RECOVERY_OPTS (0) /* NO RECOVERY / NO*/
+
+#define RECOVER_ABORT_IF_TCGETREQUEST 0x0001 /* DONT RECOVER IF TOMCAT FAIL
AFTER RECEIVING REQUEST */
+#define RECOVER_ABORT_IF_TCSENDHEADER0x0002 /* DONT RECOVER IF TOMCAT FAIL
AFTER SENDING HEADERS */
+
+
struct jk_res_data {
int status;
@@ -307,6 +313,11 @@
unsigned connect_timeout; /* connect cping/cpong delay in ms (0 means
disabled) */
unsigned reply_timeout; /* reply timeout delay in ms (0 means disabled)
*/
unsigned prepost_timeout; /* before sending a request cping/cpong
timeout delay in ms (0 means disabled)*/
+
+ /*
+ * Recovery option
+ */
+ unsigned recovery_opts; /* Set the recovery option */
};
1.48 +65 -7 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jk_ajp_common.c 11 Feb 2004 09:49:49 - 1.47
+++ jk_ajp_common.c 17 Feb 2004 10:36:00 - 1.48
@@ -1174,7 +1174,7 @@
(const char * const *)res.header_values,
