Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
Thank-you for your e-mail. Please note that i will be away from the office starting Wednesday June 29th, returning Thursday July 7th, with no access to email. In my absence, kindly contact Cheri Dueck at [EMAIL PROTECTED] Kind Regards, Natasha Hasmani Senior Event Manager - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
jfclere 2005/07/01 08:41:09
Modified:jk/native/common jk_util.c
Log:
Fix PR 34397.
Revision ChangesPath
1.71 +2 -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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- jk_util.c 9 Jun 2005 08:14:51 - 1.70
+++ jk_util.c 1 Jul 2005 15:41:08 - 1.71
@@ -219,7 +219,7 @@
}
if (0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
-return JK_LOG_ERROR_LEVEL;
+return JK_LOG_EMERG_LEVEL;
}
return JK_LOG_INFO_LEVEL;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/06/09 01:14:51 Modified:jk/native/common jk_util.c Log: Fix typo. Revision ChangesPath 1.70 +4 -4 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.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- jk_util.c 15 May 2005 15:22:05 - 1.69 +++ jk_util.c 9 Jun 2005 08:14:51 - 1.70 @@ -786,12 +786,12 @@ v = jk_map_get_string(m, buf, NULL); if (!v) return JK_LB_LOCK_DEFAULT; -else if (*v == 'o' || *v == 'O' || *v == '1') +else if (*v == 'o' || *v == 'O' || *v == '0') return JK_LB_LOCK_DEFAULT; -else if (*v == 'p' || *v == 'P' || *v == '0') +else if (*v == 'p' || *v == 'P' || *v == '1') return JK_LB_LOCK_PESSIMISTIC; else -return JK_LB_BYREQUESTS; +return JK_LB_LOCK_DEFAULT; } int jk_get_lb_worker_list(jk_map_t *m, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/05/05 10:52:27 Modified:jk/native/common jk_util.c Log: Use connection_pool_size as cachesize synonim. Revision ChangesPath 1.67 +2 -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.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- jk_util.c 3 May 2005 13:26:13 - 1.66 +++ jk_util.c 5 May 2005 17:52:27 - 1.67 @@ -46,7 +46,7 @@ #define PORT_OF_WORKER (port) #define TYPE_OF_WORKER (type) #define CACHE_OF_WORKER_DEPRECATED (cachesize) -#define CACHE_OF_WORKER (connections_per_child) +#define CACHE_OF_WORKER (connection_pool_size) #define CACHE_TIMEOUT_OF_WORKER (cache_timeout) #define RECOVERY_OPTS_OF_WORKER (recovery_options) #define CONNECT_TIMEOUT_OF_WORKER (connect_timeout) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/05/03 06:26:13
Modified:jk/native/common jk_util.c
Log:
Use macro for setting params instead sprintf -- No function change.
Add 'connections_per_child' synonim for 'cachesize' that beter reflects
the real purpose of cachesize param.
Revision ChangesPath
1.66 +56 -64jakarta-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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- jk_util.c 28 Apr 2005 17:02:35 - 1.65
+++ jk_util.c 3 May 2005 13:26:13 - 1.66
@@ -42,11 +42,11 @@
#define LIBPATH_OF_WORKER (ld_path)
#define CMD_LINE_OF_WORKER (cmd_line)
#define NATIVE_LIB_OF_WORKER(native_lib)
-#define PREFIX_OF_WORKERworker
#define HOST_OF_WORKER (host)
#define PORT_OF_WORKER (port)
#define TYPE_OF_WORKER (type)
-#define CACHE_OF_WORKER (cachesize)
+#define CACHE_OF_WORKER_DEPRECATED (cachesize)
+#define CACHE_OF_WORKER (connections_per_child)
#define CACHE_TIMEOUT_OF_WORKER (cache_timeout)
#define RECOVERY_OPTS_OF_WORKER (recovery_options)
#define CONNECT_TIMEOUT_OF_WORKER (connect_timeout)
@@ -89,6 +89,11 @@
#define HUGE_BUFFER_SIZE (8*1024)
#define LOG_LINE_SIZE(1024)
+#define MAKE_WORKER_PARAM(P) \
+strcpy(buf, worker.); \
+strcat(buf, wname); \
+strcat(buf, .);\
+strcat(buf, P)
/*
* define the log format, we're using by default the one from error.log
@@ -360,9 +365,7 @@
if (!m || !wname) {
return NULL;
}
-
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, TYPE_OF_WORKER);
-
+MAKE_WORKER_PARAM(TYPE_OF_WORKER);
return jk_map_get_string(m, buf, DEFAULT_WORKER_TYPE);
}
@@ -372,7 +375,7 @@
if (!m || !wname) {
return NULL;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, DOMAIN_OF_WORKER);
+MAKE_WORKER_PARAM(DOMAIN_OF_WORKER);
return jk_map_get_string(m, buf, def);
}
@@ -382,7 +385,7 @@
if (!m || !wname) {
return NULL;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, REDIRECT_OF_WORKER);
+ MAKE_WORKER_PARAM(REDIRECT_OF_WORKER);
return jk_map_get_string(m, buf, def);
}
@@ -394,7 +397,7 @@
return NULL;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, SECRET_OF_WORKER);
+MAKE_WORKER_PARAM(SECRET_OF_WORKER);
return jk_map_get_string(m, buf, NULL);
}
@@ -409,7 +412,7 @@
char buf[1024];
if (m prop wname pname) {
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, pname);
+MAKE_WORKER_PARAM(pname);
*prop = jk_map_get_string(m, buf, NULL);
if (*prop) {
return JK_TRUE;
@@ -425,7 +428,7 @@
if (m prop wname pname) {
int i;
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, pname);
+MAKE_WORKER_PARAM(pname);
i = jk_map_get_int(m, buf, -1);
if (-1 != i) {
*prop = i;
@@ -443,7 +446,7 @@
return NULL;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, HOST_OF_WORKER);
+MAKE_WORKER_PARAM(HOST_OF_WORKER);
return jk_map_get_string(m, buf, def);
}
@@ -456,7 +459,7 @@
return -1;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, PORT_OF_WORKER);
+MAKE_WORKER_PARAM(PORT_OF_WORKER);
return jk_map_get_int(m, buf, def);
}
@@ -481,13 +484,16 @@
int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
+int rv;
if (!m || !wname) {
return -1;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname, CACHE_OF_WORKER);
-
+MAKE_WORKER_PARAM(CACHE_OF_WORKER);
+if ((rv = jk_map_get_int(m, buf, -1)) = 0)
+return rv;
+MAKE_WORKER_PARAM(CACHE_OF_WORKER_DEPRECATED);
return jk_map_get_int(m, buf, def);
}
@@ -499,8 +505,7 @@
return -1;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname,
-SOCKET_TIMEOUT_OF_WORKER);
+MAKE_WORKER_PARAM(SOCKET_TIMEOUT_OF_WORKER);
return jk_map_get_int(m, buf, def);
}
@@ -513,8 +518,7 @@
return -1;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname,
-WORKER_RECOVER_TIME);
+MAKE_WORKER_PARAM(WORKER_RECOVER_TIME);
return jk_map_get_int(m, buf, def);
}
@@ -527,8 +531,7 @@
return -1;
}
-sprintf(buf, PREFIX_OF_WORKER .%s.%s, wname,
-SOCKET_BUFFER_OF_WORKER);
+MAKE_WORKER_PARAM(SOCKET_BUFFER_OF_WORKER);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/04/28 10:02:35 Modified:jk/native/common jk_util.c Log: Fix typo. It was meant to be SECRET_OF_WORKER not SECRET_KEY_OF_WORKER, altough both are valid. Revision ChangesPath 1.65 +2 -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.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- jk_util.c 27 Apr 2005 07:39:38 - 1.64 +++ jk_util.c 28 Apr 2005 17:02:35 - 1.65 @@ -1027,7 +1027,7 @@ IS_WORKER_DISABLED, IS_WORKER_STOPPED, WORKER_RECOVER_TIME, -SECRET_KEY_OF_WORKER, +SECRET_OF_WORKER, RETRIES_OF_WORKER, NULL }; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/04/27 00:39:38
Modified:jk/native/common jk_util.c
Log:
Hack to support building with free Visual C++ Toolkit 2003 using MSVCRT
libraries.
Revision ChangesPath
1.64 +7 -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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- jk_util.c 26 Apr 2005 15:28:18 - 1.63
+++ jk_util.c 27 Apr 2005 07:39:38 - 1.64
@@ -89,6 +89,7 @@
#define HUGE_BUFFER_SIZE (8*1024)
#define LOG_LINE_SIZE(1024)
+
/*
* define the log format, we're using by default the one from error.log
*
@@ -99,6 +100,11 @@
#define JK_TIME_FORMAT [%a %b %d %H:%M:%S %Y]
#endif
+/* Visual C++ Toolkit 2003 support */
+#if defined (_MSC_VER) (_MSC_VER == 1310)
+extern long _ftol(double); /* defined by VC6 C libs */
+extern long _ftol2(double dblSource) { return _ftol(dblSource); }
+#endif
static const char *jk_level_werbs[] = {
[ JK_LOG_TRACE_VERB ] ,
-
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/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
mturk 2005/02/16 03:43:40
Modified:jk/native/common jk_util.c
Log:
Use 4 digits (or more) for pid and tid. Log just looks nicer.
Revision ChangesPath
1.58 +3 -3 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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- jk_util.c 16 Feb 2005 09:25:35 - 1.57
+++ jk_util.c 16 Feb 2005 11:43:39 - 1.58
@@ -294,10 +294,10 @@
/* Log [pid:threadid] for debug and trace levels */
if (l-level JK_LOG_INFO_LEVEL) {
#ifdef USE_SPRINTF /* until we get a snprintf function */
-used += sprintf(buf[used], [%d:%d] , getpid(),
+used += sprintf(buf[used], [%04d:%04d] , getpid(),
jk_gettid());
#else
-used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%04d:%04d] ,
getpid(), jk_gettid());
#endif
if (used 0) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2005/02/16 04:07:28
Modified:jk/native/common jk_util.c
Log:
Allow worker.lb.method to accept string methods t[raffic] or
r[equest]. Only the first letter is checked.
Revision ChangesPath
1.59 +11 -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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- jk_util.c 16 Feb 2005 11:43:39 - 1.58
+++ jk_util.c 16 Feb 2005 12:07:28 - 1.59
@@ -704,12 +704,21 @@
int jk_get_lb_method(jk_map_t *m, const char *wname)
{
char buf[1024];
+const char *v;
if (!m || !wname) {
return DEFAULT_LB_FACTOR;
}
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, METHOD_OF_WORKER);
-return jk_map_get_int(m, buf, JK_LB_BYREQUESTS);
+v = jk_map_get_string(m, buf, NULL);
+if (!v)
+return JK_LB_BYREQUESTS;
+else if (*v == 't' || *v == 'T' || *v == '1')
+return JK_LB_BYTRAFFIC;
+else if (*v == 'r' || *v == 'R' || *v == '0')
+return JK_LB_BYREQUESTS;
+else
+return JK_LB_BYREQUESTS;
}
int jk_get_lb_worker_list(jk_map_t *m,
-
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/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
mturk 2005/02/13 23:57:41
Modified:jk/native/common jk_util.c
Log:
Unabify the source.
Revision ChangesPath
1.55 +3 -3 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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- jk_util.c 12 Feb 2005 19:26:41 - 1.54
+++ jk_util.c 14 Feb 2005 07:57:41 - 1.55
@@ -1089,10 +1089,10 @@
{
pthread_t t = pthread_self();
#ifdef AS400
- /* OS400 use 64 bits ThreadId, get only low 32 bits for now */
+/* OS400 use 64 bits ThreadId, get only low 32 bits for now */
pthread_id_np_t tid;
pthread_getunique_np(t, tid);
- return ((int)(tid.intId.lo 0x));
+return ((int)(tid.intId.lo 0x));
#else
int tid = (int)(t 0x);
return tid;
-
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
mturk 2004/12/12 23:51:28
Modified:jk/native/common jk_util.c
Log:
Rename balanced_workers directive to balance_workers keeping old
one for backward compatibility.
Norm says that this makes more sense from English grammar point of view.
Revision ChangesPath
1.49 +11 -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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jk_util.c 12 Dec 2004 15:35:50 - 1.48
+++ jk_util.c 13 Dec 2004 07:51:28 - 1.49
@@ -55,7 +55,9 @@
#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
#define RECYCLE_TIMEOUT_OF_WORKER (recycle_timeout)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
+/* deprecated directive. Use balance_workers instead */
#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)
@@ -679,6 +681,14 @@
if (m list num_of_wokers lb_wname) {
char **ar = NULL;
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, lb_wname,
+BALANCE_WORKERS);
+ar = jk_map_get_string_list(m, buf, num_of_wokers, NULL);
+if (ar) {
+*list = ar;
+return JK_TRUE;
+}
+/* Try old balanced_workers directive */
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, lb_wname,
BALANCED_WORKERS);
ar = jk_map_get_string_list(m, buf, num_of_wokers, NULL);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/12/12 07:35:50
Modified:jk/native/common jk_util.c
Log:
Add warn level checking. Also make emerge the same as error,
having emerge as type of error. Use info as default log level.
Thanks Rainer.
Revision ChangesPath
1.48 +16 -8 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jk_util.c 7 Dec 2004 13:29:55 - 1.47
+++ jk_util.c 12 Dec 2004 15:35:50 - 1.48
@@ -91,7 +91,7 @@
static const char *jk_level_werbs[] = {
-[ JK_LOG_TRACE_WERB ] ,
+[ JK_LOG_TRACE_VERB ] ,
[ JK_LOG_DEBUG_VERB ] ,
[ JK_LOG_INFO_VERB ] ,
[ JK_LOG_WARNING_VERB ] ,
@@ -172,23 +172,31 @@
int jk_parse_log_level(const char *level)
{
+if (0 == strcasecmp(level, JK_LOG_TRACE_VERB)) {
+return JK_LOG_TRACE_LEVEL;
+}
+
+if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
+return JK_LOG_DEBUG_LEVEL;
+}
+
if (0 == strcasecmp(level, JK_LOG_INFO_VERB)) {
return JK_LOG_INFO_LEVEL;
}
+if (0 == strcasecmp(level, JK_LOG_WARNING_VERB)) {
+return JK_LOG_WARNING_LEVEL;
+}
+
if (0 == strcasecmp(level, JK_LOG_ERROR_VERB)) {
return JK_LOG_ERROR_LEVEL;
}
if (0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
-return JK_LOG_EMERG_LEVEL;
-}
-
-if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
-return JK_LOG_DEBUG_LEVEL;
+return JK_LOG_ERROR_LEVEL;
}
-return JK_LOG_TRACE_LEVEL;
+return JK_LOG_INFO_LEVEL;
}
int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
hgomez 2004/12/07 02:54:11
Modified:jk/native/common jk_util.c
Log:
Adapt to iSeries 64 bits ThreadId
Revision ChangesPath
1.44 +8 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jk_util.c 30 Nov 2004 13:11:21 - 1.43
+++ jk_util.c 7 Dec 2004 10:54:10 - 1.44
@@ -1021,7 +1021,14 @@
{
pthread_t t = pthread_self();
+#ifdef AS400
+ /* OS400 use 64 bits ThreadId, get only low 32 bits for now */
+pthread_id_np_t tid;
+pthread_getunique_np(t, tid);
+ return ((int)(tid.intId.lo 0x));
+#else
return (int)(t 0x);
+#endif /* AS400 */
}
#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/12/07 05:29:55
Modified:jk/native/common jk_util.c
Log:
Remove CRLF
Revision ChangesPath
1.47 +16 -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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- jk_util.c 7 Dec 2004 13:23:14 - 1.46
+++ jk_util.c 7 Dec 2004 13:29:55 - 1.47
@@ -1026,18 +1026,18 @@
s-retries = JK_RETRIES;
}
-#ifdef _MT_CODE_PTHREAD
-int jk_gettid()
-{
-pthread_t t = pthread_self();
-#ifdef AS400
- /* OS400 use 64 bits ThreadId, get only low 32 bits for now */
-pthread_id_np_t tid;
-pthread_getunique_np(t, tid);
- return ((int)(tid.intId.lo 0x));
-#else
-int tid = (int)(t 0x);
-return tid;
-#endif /* AS400 */
-}
-#endif
+#ifdef _MT_CODE_PTHREAD
+int jk_gettid()
+{
+pthread_t t = pthread_self();
+#ifdef AS400
+ /* OS400 use 64 bits ThreadId, get only low 32 bits for now */
+pthread_id_np_t tid;
+pthread_getunique_np(t, tid);
+ return ((int)(tid.intId.lo 0x));
+#else
+int tid = (int)(t 0x);
+return tid;
+#endif /* AS400 */
+}
+#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/29 08:10:51
Modified:jk/native/common jk_util.c
Log:
Re-apply jfclere's patch from rev 1.31that was unitentionally overwriten.
Revision ChangesPath
1.41 +6 -4 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jk_util.c 19 Nov 2004 15:58:51 - 1.40
+++ jk_util.c 29 Nov 2004 16:10:51 - 1.41
@@ -225,9 +225,11 @@
{
if (l *l) {
file_logger_t *p = (*l)-logger_private;
-fflush(p-logfile);
-fclose(p-logfile);
-free(p);
+if (p) {
+fflush(p-logfile);
+fclose(p-logfile);
+free(p);
+}
free(*l);
*l = NULL;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/29 08:22:08
Modified:jk/native/common jk_util.c
Log:
Log [pid:tid] for both debug and trace log levels.
Revision ChangesPath
1.42 +4 -3 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- jk_util.c 29 Nov 2004 16:10:51 - 1.41
+++ jk_util.c 29 Nov 2004 16:22:08 - 1.42
@@ -273,8 +273,9 @@
#endif
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
-
-if (l-level == JK_LOG_TRACE_LEVEL) {
+
+/* Log [pid:threadid] for debug and trace levels */
+if (l-level JK_LOG_INFO_LEVEL) {
#ifdef USE_SPRINTF /* until we get a snprintf function */
used += sprintf(buf[used], [%d:%d] , getpid(),
jk_gettid());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/19 05:00:43
Modified:jk/native/common jk_util.c
Log:
Assure that the number of retries is at least one.
Revision ChangesPath
1.39 +7 -3 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_util.c 12 Nov 2004 18:45:24 - 1.38
+++ jk_util.c 19 Nov 2004 13:00:43 - 1.39
@@ -526,7 +526,7 @@
int jk_get_worker_retries(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
-
+int rv;
if (!m || !wname) {
return -1;
}
@@ -534,7 +534,11 @@
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
RETRIES_OF_WORKER);
-return jk_map_get_int(m, buf, def);
+rv = jk_map_get_int(m, buf, def);
+if (rv 1)
+rv = 1;
+
+return rv;
}
int jk_get_worker_recovery_opts(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
mturk 2004/11/19 07:58:52
Modified:jk/native/common jk_util.c
Log:
Use boolen values for boolean kind of properties.
Also set default worker type to ajp13, cause ajp12 is deprecated.
Revision ChangesPath
1.40 +10 -8 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jk_util.c 19 Nov 2004 13:00:43 - 1.39
+++ jk_util.c 19 Nov 2004 15:58:51 - 1.40
@@ -24,6 +24,8 @@
#include jk_util.h
#include jk_ajp12_worker.h
+#include jk_ajp13_worker.h
+#include jk_ajp14_worker.h
#include jk_mt.h
#define SYSPROPS_OF_WORKER (sysprops)
@@ -57,12 +59,12 @@
#define STICKY_SESSION (sticky_session)
#define LOCAL_WORKER_ONLY_FLAG (local_worker_only)
#define LOCAL_WORKER_FLAG (local_worker)
-#define WORKER_AJP12(ajp12)
-#define DEFAULT_WORKER_TYPE JK_AJP12_WORKER_NAME
+
+#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER(secretkey)
#define RETRIES_OF_WORKER (retries)
-#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
+#define DEFAULT_WORKER JK_AJP13_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME (worker.list)
#define DEFAULT_LB_FACTOR (1)
#define LOG_FORMAT (log_format)
@@ -450,7 +452,7 @@
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
SOCKET_KEEPALIVE_OF_WORKER);
-return jk_map_get_int(m, buf, def);
+return jk_map_get_bool(m, buf, def);
}
int jk_get_worker_cache_timeout(jk_map_t *m, const char *wname, int def)
@@ -610,7 +612,7 @@
if (m wname) {
int value;
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, STICKY_SESSION);
-value = jk_map_get_int(m, buf, 1);
+value = jk_map_get_bool(m, buf, 1);
if (!value)
rc = JK_FALSE;
}
@@ -624,7 +626,7 @@
if (m wname) {
int value;
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, LOCAL_WORKER_FLAG);
-value = jk_map_get_int(m, buf, 0);
+value = jk_map_get_bool(m, buf, 0);
if (value)
rc = JK_TRUE;
}
@@ -639,7 +641,7 @@
int value;
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, lb_wname,
LOCAL_WORKER_ONLY_FLAG);
-value = jk_map_get_int(m, buf, 0);
+value = jk_map_get_bool(m, buf, 0);
if (value)
rc = JK_TRUE;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/11 09:06:06
Modified:jk/native/common jk_util.c
Log:
Implement new __FUNCTION__ logging.
Also log PID and ThreadID. This helps tracing log messages
when they are comming from diferent childs/threads.
Revision ChangesPath
1.35 +46 -9 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_util.c 11 Nov 2004 09:44:29 - 1.34
+++ jk_util.c 11 Nov 2004 17:06:06 - 1.35
@@ -24,6 +24,7 @@
#include jk_util.h
#include jk_ajp12_worker.h
+#include jk_mt.h
#define SYSPROPS_OF_WORKER (sysprops)
#define STDERR_OF_WORKER(stderr)
@@ -84,6 +85,17 @@
#define JK_TIME_FORMAT [%a %b %d %H:%M:%S %Y]
#endif
+
+static const char *jk_level_werbs[] = {
+[ JK_LOG_TRACE_WERB ] ,
+[ JK_LOG_DEBUG_VERB ] ,
+[ JK_LOG_INFO_VERB ] ,
+[ JK_LOG_WARNING_VERB ] ,
+[ JK_LOG_ERROR_VERB ] ,
+[ JK_LOG_EMERG_VERB ] ,
+NULL
+};
+
const char *jk_log_fmt = JK_TIME_FORMAT;
static void set_time_str(char *str, int len)
@@ -168,7 +180,11 @@
return JK_LOG_EMERG_LEVEL;
}
-return JK_LOG_DEBUG_LEVEL;
+if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
+return JK_LOG_DEBUG_LEVEL;
+}
+
+return JK_LOG_TRACE_LEVEL;
}
int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
@@ -245,7 +261,6 @@
f++;
}
-#ifdef USE_SPRINTF /* until we get a snprintf function */
#ifdef NETWARE
buf = (char *)malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
@@ -253,15 +268,37 @@
#endif
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
+
+#ifdef USE_SPRINTF /* until we get a snprintf function */
if (line)
-used += sprintf(buf[used], [%s (%d)]: , f, line);
+used += sprintf(buf[used], [%d:%d] , getpid(),
+JK_THREADID());
+#else
+if (line)
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
+ getpid(), JK_THREADID());
+#endif
+if (used 0) {
+return 0; /* [V] not sure what to return... */
+}
+if (line) {
+strcat(buf, jk_level_werbs[level]);
+used += 8;
+
+if (funcname) {
+strcat(buf, funcname);
+strcat(buf, ::);
+used += strlen(funcname) + 2;
+}
+}
+
+#ifdef USE_SPRINTF /* until we get a snprintf function */
+if (line)
+used += sprintf(buf[used], %s (%d): , f, line);
#else
-set_time_str(buf, HUGE_BUFFER_SIZE);
-used = strlen(buf);
if (line)
-used +=
-snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
- line);
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, %s (%d): ,
+ f, line);
#endif
if (used 0) {
return 0; /* [V] not sure what to return... */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/11 23:52:23
Modified:jk/native/common jk_util.c
Log:
Log PID:TID only when log level is TRACE.
Revision ChangesPath
1.37 +4 -4 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_util.c 12 Nov 2004 07:46:48 - 1.36
+++ jk_util.c 12 Nov 2004 07:52:23 - 1.37
@@ -269,17 +269,17 @@
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
+if (l-level == JK_LOG_TRACE_LEVEL) {
#ifdef USE_SPRINTF /* until we get a snprintf function */
-if (line)
used += sprintf(buf[used], [%d:%d] , getpid(),
jk_gettid());
#else
-if (line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
getpid(), jk_gettid());
#endif
-if (used 0) {
-return 0; /* [V] not sure what to return... */
+if (used 0) {
+return 0;
+}
}
if (line) {
strcat(buf, jk_level_werbs[level]);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/08 05:48:12
Modified:jk/native/common jk_util.c
Log:
Add recycle_timeout instead socket_timeout
Revision ChangesPath
1.32 +21 -8 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_util.c 5 Nov 2004 15:28:39 - 1.31
+++ jk_util.c 8 Nov 2004 13:48:11 - 1.32
@@ -50,6 +50,7 @@
#define REPLY_TIMEOUT_OF_WORKER (reply_timeout)
#define SOCKET_TIMEOUT_OF_WORKER(socket_timeout)
#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
+#define RECYCLE_TIMEOUT_OF_WORKER (recycle_timeout)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
#define BALANCED_WORKERS(balanced_workers)
#define STICKY_SESSION (sticky_session)
@@ -61,7 +62,7 @@
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME (worker.list)
-#define DEFAULT_LB_FACTOR (1.0)
+#define DEFAULT_LB_FACTOR (1)
#define LOG_FORMAT (log_format)
#define TOMCAT32_BRIDGE_NAME(tomcat32)
@@ -205,11 +206,9 @@
{
if (l *l) {
file_logger_t *p = (*l)-logger_private;
-if (p) {
- fflush(p-logfile);
- fclose(p-logfile);
- free(p);
-}
+fflush(p-logfile);
+fclose(p-logfile);
+free(p);
free(*l);
*l = NULL;
@@ -471,6 +470,20 @@
return map_get_int(m, buf, def);
}
+int jk_get_worker_recycle_timeout(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,
+RECYCLE_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];
@@ -520,7 +533,7 @@
jk_log_fmt = (logformat) ? logformat : JK_TIME_FORMAT;
}
-double jk_get_lb_factor(jk_map_t *m, const char *wname)
+int jk_get_lb_factor(jk_map_t *m, const char *wname)
{
char buf[1024];
@@ -530,7 +543,7 @@
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, LOAD_FACTOR_OF_WORKER);
-return map_get_double(m, buf, DEFAULT_LB_FACTOR);
+return map_get_int(m, buf, DEFAULT_LB_FACTOR);
}
int jk_get_is_sticky_session(jk_map_t *m, const char *wname)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/10/08 00:20:33
Modified:jk/native/common jk_util.c
Log:
Untabify the source and use size_t for strlens.
Revision ChangesPath
1.29 +26 -26jakarta-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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_util.c 13 Jul 2004 13:58:10 - 1.28
+++ jk_util.c 8 Oct 2004 07:20:33 - 1.29
@@ -33,7 +33,7 @@
#define MX_OF_WORKER(mx)
#define MS_OF_WORKER(ms)
#define CP_OF_WORKER(class_path)
-#define BRIDGE_OF_WORKER (bridge)
+#define BRIDGE_OF_WORKER(bridge)
#define JVM_OF_WORKER (jvm_lib)
#define LIBPATH_OF_WORKER (ld_path)
#define CMD_LINE_OF_WORKER (cmd_line)
@@ -45,9 +45,9 @@
#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)
+#define CONNECT_TIMEOUT_OF_WORKER (connect_timeout)
+#define PREPOST_TIMEOUT_OF_WORKER (prepost_timeout)
+#define REPLY_TIMEOUT_OF_WORKER (reply_timeout)
#define SOCKET_TIMEOUT_OF_WORKER(socket_timeout)
#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
@@ -62,13 +62,13 @@
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME (worker.list)
#define DEFAULT_LB_FACTOR (1.0)
-#define LOG_FORMAT (log_format)
+#define LOG_FORMAT (log_format)
-#define TOMCAT32_BRIDGE_NAME (tomcat32)
-#define TOMCAT33_BRIDGE_NAME (tomcat33)
-#define TOMCAT40_BRIDGE_NAME (tomcat40)
-#define TOMCAT41_BRIDGE_NAME (tomcat41)
-#define TOMCAT50_BRIDGE_NAME (tomcat5)
+#define TOMCAT32_BRIDGE_NAME(tomcat32)
+#define TOMCAT33_BRIDGE_NAME(tomcat33)
+#define TOMCAT40_BRIDGE_NAME(tomcat40)
+#define TOMCAT41_BRIDGE_NAME(tomcat41)
+#define TOMCAT50_BRIDGE_NAME(tomcat5)
#define HUGE_BUFFER_SIZE (8*1024)
#define LOG_LINE_SIZE(1024)
@@ -141,7 +141,7 @@
if( l
(l-level = level || level == JK_LOG_REQUEST_LEVEL)
l-logger_private what) {
-unsigned sz = strlen(what);
+size_t sz = strlen(what);
if(sz) {
file_logger_t *p = l-logger_private;
fwrite(what, 1, sz, p-logfile);
@@ -241,7 +241,7 @@
#endif
char *f = (char *)(file + strlen(file) - 1);
va_list args;
-int used = 0;
+size_t used = 0;
while(f != file '\\' != *f '/' != *f) {
f--;
@@ -685,25 +685,25 @@
unsigned *bt)
{
char buf[1024];
- char *type;
-
+char *type;
+
if(m bt wname) {
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, BRIDGE_OF_WORKER);
type = map_get_string(m, buf, NULL);
if(type) {
- if (! strcasecmp(type, TOMCAT32_BRIDGE_NAME))
- *bt = TC32_BRIDGE_TYPE;
- else if (! strcasecmp(type, TOMCAT33_BRIDGE_NAME))
- *bt = TC33_BRIDGE_TYPE;
- else if (! strcasecmp(type, TOMCAT40_BRIDGE_NAME))
- *bt = TC40_BRIDGE_TYPE;
- else if (! strcasecmp(type, TOMCAT41_BRIDGE_NAME))
- *bt = TC41_BRIDGE_TYPE;
- else if (! strcasecmp(type, TOMCAT50_BRIDGE_NAME))
- *bt = TC50_BRIDGE_TYPE;
-
+if (! strcasecmp(type, TOMCAT32_BRIDGE_NAME))
+*bt = TC32_BRIDGE_TYPE;
+else if (! strcasecmp(type, TOMCAT33_BRIDGE_NAME))
+*bt = TC33_BRIDGE_TYPE;
+else if (! strcasecmp(type, TOMCAT40_BRIDGE_NAME))
+*bt = TC40_BRIDGE_TYPE;
+else if (! strcasecmp(type, TOMCAT41_BRIDGE_NAME))
+*bt = TC41_BRIDGE_TYPE;
+else if (! strcasecmp(type, TOMCAT50_BRIDGE_NAME))
+*bt = TC50_BRIDGE_TYPE;
+
return JK_TRUE;
}
}
-
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,
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
glenn 2003/03/19 06:25:40
Modified:jk/native/common jk_util.c
Log:
Bug 18135 fix, thanks to Gabriele Garuglieri
Revision ChangesPath
1.21 +2 -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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_util.c 28 Feb 2003 17:58:39 - 1.20
+++ jk_util.c 19 Mar 2003 14:25:40 - 1.21
@@ -504,7 +504,7 @@
if (m wname) {
int value;
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, STICKY_SESSION);
-value = map_get_int(m, buf, 0);
+value = map_get_int(m, buf, 1);
if (!value) rc = JK_FALSE;
}
return rc;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2002/06/25 00:06:42
Modified:jk/native/common jk_util.c
Log:
Introduced socket and cache timeout.
By Jan Singer, Henri Gomez and Mladen Turk.
Revision ChangesPath
1.16 +80 -31jakarta-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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_util.c 21 Jun 2002 15:28:56 - 1.15
+++ jk_util.c 25 Jun 2002 07:06:42 - 1.16
@@ -83,6 +83,9 @@
#define PORT_OF_WORKER (port)
#define TYPE_OF_WORKER (type)
#define CACHE_OF_WORKER (cachesize)
+#define CACHE_TIMEOUT_OF_WORKER (cache_timeout)
+#define SOCKET_TIMEOUT_OF_WORKER(socket_timeout)
+#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
#define BALANCED_WORKERS(balanced_workers)
#define LOCAL_WORKER_ONLY_FLAG (local_worker_only)
@@ -94,7 +97,7 @@
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME (worker.list)
#define DEFAULT_LB_FACTOR (1.0)
-#define LOG_FORMAT (log_format)
+#define LOG_FORMAT (log_format)
#define HUGE_BUFFER_SIZE (8*1024)
#define LOG_LINE_SIZE(1024)
@@ -118,11 +121,11 @@
static void set_time_str(char * str, int len)
{
- time_t t = time(NULL);
- struct tm *tms;
+time_t t = time(NULL);
+struct tm *tms;
- tms = localtime(t);
- strftime(str, len, jk_log_fmt, tms);
+tms = localtime(t);
+strftime(str, len, jk_log_fmt, tms);
}
static int JK_METHOD log_to_file(jk_logger_t *l,
@@ -136,8 +139,8 @@
if(sz) {
file_logger_t *p = l-logger_private;
fwrite(what, 1, sz, p-logfile);
- /* [V] Flush the dam' thing! */
- fflush(p-logfile);
+/* [V] Flush the dam' thing! */
+fflush(p-logfile);
}
return JK_TRUE;
@@ -243,13 +246,13 @@
if (NULL == buf)
return -1;
#endif
- set_time_str(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+set_time_str(buf, HUGE_BUFFER_SIZE);
+used = strlen(buf);
if(line)
used += sprintf(buf[used], [%s (%d)]: , f, line);
#else
- set_time_str(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+set_time_str(buf, HUGE_BUFFER_SIZE);
+used = strlen(buf);
if(line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
#endif
@@ -288,7 +291,7 @@
}
char *jk_get_worker_secret(jk_map_t *m,
- const char *wname)
+ const char *wname)
{
char buf[1024];
char *secret;
@@ -310,9 +313,9 @@
/* Functions that can be simulated with these should be deprecated.*/
int jk_get_worker_str_prop(jk_map_t *m,
-const char *wname,
-const char *pname,
-char **prop)
+ const char *wname,
+ const char *pname,
+ char **prop)
{
char buf[1024];
@@ -327,9 +330,9 @@
}
int jk_get_worker_int_prop(jk_map_t *m,
-const char *wname,
-const char *pname,
-int *prop)
+ const char *wname,
+ const char *pname,
+ int *prop)
{
char buf[1024];
@@ -390,6 +393,51 @@
return map_get_int(m, buf, def);
}
+int jk_get_worker_socket_timeout(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, SOCKET_TIMEOUT_OF_WORKER);
+
+return map_get_int(m, buf, def);
+}
+
+int jk_get_worker_socket_keepalive(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, SOCKET_KEEPALIVE_OF_WORKER);
+
+return map_get_int(m, buf, def);
+}
+
+int jk_get_worker_cache_timeout(jk_map_t *m,
+const char *wname,
+int def)
+{
+char buf[1024];
+
+if(!m || !wname) {
+return -1;
+}
+
+
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
andya 01/06/15 04:38:25
Modified:jk/native/common jk_util.c
Log:
Refactored jk_is_path_poperty() and jk_is_cmd_line_poperty() to call a
common helper function.
Revision ChangesPath
1.4 +21 -20jakarta-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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_util.c 2001/06/07 14:40:50 1.3
+++ jk_util.c 2001/06/15 11:38:23 1.4
@@ -57,7 +57,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Henri Gomez [EMAIL PROTECTED] *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***/
@@ -566,30 +566,31 @@
}
return JK_FALSE;
}
-
+
+static int jk_is_some_property(const char *prp_name, const char *suffix)
+{
+if (prp_name suffix) {
+ size_t prp_name_len = strlen(prp_name);
+ size_t suffix_len = strlen(suffix);
+ if (prp_name_len = suffix_len) {
+ const char *prp_suffix = prp_name + prp_name_len - suffix_len;
+ if(0 == strcmp(suffix, prp_suffix)) {
+ return JK_TRUE;
+ }
+}
+}
+
+return JK_FALSE;
+}
+
int jk_is_path_poperty(const char *prp_name)
-{
-char *path_suffix = path;
-if(prp_name (strlen(prp_name) = strlen(path_suffix))) {
-const char *suffix = prp_name + strlen(prp_name) - strlen(path_suffix);
-if(0 == strcmp(suffix, path_suffix)) {
-return JK_TRUE;
-}
-}
-
-return JK_FALSE;
+{
+ return jk_is_some_property(prp_name, path);
}
int jk_is_cmd_line_poperty(const char *prp_name)
{
-if(prp_name (strlen(prp_name) = strlen(CMD_LINE_OF_WORKER))) {
-const char *suffix = prp_name + strlen(prp_name) -
strlen(CMD_LINE_OF_WORKER);
-if(0 == strcmp(suffix, CMD_LINE_OF_WORKER)) {
-return JK_TRUE;
-}
-}
-
-return JK_FALSE;
+ return jk_is_some_property(prp_name, CMD_LINE_OF_WORKER);
}
int jk_get_worker_stdout(jk_map_t *m,
