cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
mturk 2005/05/15 09:50:26 Modified:jk/native/common jk_worker.c Log: Exclude static lock in case there is no multithreading compiled in. Revision ChangesPath 1.35 +4 -1 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- jk_worker.c 15 May 2005 13:02:38 - 1.34 +++ jk_worker.c 15 May 2005 16:50:26 - 1.35 @@ -25,6 +25,7 @@ #include jk_worker_list.h #include jk_worker.h #include jk_util.h +#include jk_mt.h static void close_workers(jk_logger_t *l); @@ -37,7 +38,9 @@ /* Global worker list */ static jk_map_t *worker_map; +#if _MT_CODE static JK_CRIT_SEC worker_lock; +#endif static int worker_maintain_time = 0; int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
mturk 2005/05/15 10:00:26
Modified:jk/native/common jk_worker.c
Log:
Add more informative logging for unknown worker.type directive.
Revision ChangesPath
1.36 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_worker.c 15 May 2005 16:50:26 - 1.35
+++ jk_worker.c 15 May 2005 17:00:26 - 1.36
@@ -131,8 +131,8 @@
*rc = NULL;
if (!fac) {
-jk_log(l, JK_LOG_ERROR, NULL factory for %s,
- type);
+jk_log(l, JK_LOG_ERROR, Unknown worker type %s for worker %s,
+ type, name);
JK_TRACE_EXIT(l);
return JK_FALSE;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
mturk 2005/02/13 04:20:01
Modified:jk/native/common jk_worker.c
Log:
Use worker_env worker list.
Revision ChangesPath
1.29 +9 -7 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_worker.c 12 Feb 2005 19:27:43 - 1.28
+++ jk_worker.c 13 Feb 2005 12:20:01 - 1.29
@@ -40,8 +40,6 @@
int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l)
{
-char **worker_list = NULL;
-unsigned num_of_workers = 0;
JK_TRACE_ENTER(l);
@@ -50,19 +48,23 @@
return JK_FALSE;
}
-if (!jk_get_worker_list(init_data, worker_list, num_of_workers)) {
+if (!jk_get_worker_list(init_data, (we-worker_list),
+we-num_of_workers)) {
JK_TRACE_EXIT(l);
+we-num_of_workers = 0;
+we-worker_list = NULL;
return JK_FALSE;
}
-if (!build_worker_map(init_data, worker_list, num_of_workers, we, l)) {
+if (!build_worker_map(init_data, we-worker_list,
+ we-num_of_workers, we, l)) {
close_workers(l);
+we-num_of_workers = 0;
+we-worker_list = NULL;
JK_TRACE_EXIT(l);
return JK_FALSE;
}
-we-num_of_workers = num_of_workers;
-we-first_worker = worker_list[0];
JK_TRACE_EXIT(l);
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_worker.c
mturk 2005/02/12 11:27:43
Modified:jk/native/common jk_worker.c
Log:
Initialize worker mount list if present inside config.
Revision ChangesPath
1.28 +21 -1 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_worker.c 6 Feb 2005 13:30:34 - 1.27
+++ jk_worker.c 12 Feb 2005 19:27:43 - 1.28
@@ -106,6 +106,8 @@
const char *type = jk_get_worker_type(init_data, name);
worker_factory fac = get_factory_for(type);
jk_worker_t *w = NULL;
+unsigned int i, num_of_maps;
+char **map_names;
*rc = NULL;
@@ -147,6 +149,24 @@
JK_TRACE_EXIT(l);
return JK_FALSE;
}
+if (jk_get_worker_mount_list(init_data, name,
+ map_names,
+ num_of_maps) num_of_maps) {
+for (i = 0; i num_of_maps; i++) {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+mounting %s to worker %s,
+map_names[i], name);
+if (uri_worker_map_add(we-uri_to_worker, map_names[i],
+ name, l) == JK_FALSE) {
+w-destroy(w, l);
+jk_log(l, JK_LOG_ERROR,
+ validate failed for %s, name);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+}
+}
*rc = w;
JK_TRACE_EXIT(l);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c jk_worker_list.h
mturk 2004/12/16 00:42:19
Modified:jk/native/common jk_worker.c jk_worker_list.h
Log:
Move the static variable from header to source file.
Revision ChangesPath
1.24 +4 -1 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_worker.c 11 Nov 2004 19:11:56 - 1.23
+++ jk_worker.c 16 Dec 2004 08:42:19 - 1.24
@@ -35,6 +35,9 @@
unsigned num_of_workers,
jk_worker_env_t *we, jk_logger_t *l);
+/* Global worker list */
+static jk_map_t *worker_map;
+
int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l)
{
char **worker_list = NULL;
1.11 +1 -3
jakarta-tomcat-connectors/jk/native/common/jk_worker_list.h
Index: jk_worker_list.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker_list.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_worker_list.h 8 Oct 2004 07:50:40 - 1.10
+++ jk_worker_list.h 16 Dec 2004 08:42:19 - 1.11
@@ -54,8 +54,6 @@
};
typedef struct worker_factory_record worker_factory_record_t;
-static jk_map_t *worker_map;
-
static worker_factory_record_t worker_factories[] = {
/*
* AJPv12 worker, this is the stable worker.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
mturk 2004/11/08 05:48:56 Modified:jk/native/common jk_worker.c Log: Use integers for lbfactors Revision ChangesPath 1.18 +1 -1 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_worker.c 5 Nov 2004 15:28:39 - 1.17 +++ jk_worker.c 8 Nov 2004 13:48:56 - 1.18 @@ -160,7 +160,7 @@ } } } -jk_map_free(worker_map); +map_free(worker_map); } static int build_worker_map(jk_map_t *init_data, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
billbarker2004/05/04 22:43:22 Modified:jk/native/common jk_worker.c Log: Grammatical fix for logging message. Fix for Bug #28761 Submitted By: Hans Schmid [EMAIL PROTECTED] Revision ChangesPath 1.15 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_worker.c 24 Feb 2004 08:45:47 - 1.14 +++ jk_worker.c 5 May 2004 05:43:22 - 1.15 @@ -91,8 +91,8 @@ rc = map_get(worker_map, name, NULL); -jk_log(l, JK_LOG_DEBUG, wc_get_worker_for_name, done %s found a worker\n, -rc ? : did not); +jk_log(l, JK_LOG_DEBUG, wc_get_worker_for_name, done %s a worker\n, +rc ? found : did not find); return rc; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c jk_registry.c jk_ajp14_worker.c jk_ajp13_worker.c
costin 01/11/16 14:59:06 Modified:jk/native/common jk_worker.c jk_registry.c jk_ajp14_worker.c jk_ajp13_worker.c Log: Minor changes ( remove unused imports, add socket channel to the registry ) Revision ChangesPath 1.9 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_worker.c Index: jk_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_worker.c 2001/11/05 23:22:05 1.8 +++ jk_worker.c 2001/11/16 22:59:06 1.9 @@ -60,7 +60,7 @@ * Description: Workers controller * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.8 $ * + * Version: $Revision: 1.9 $ * ***/ /* #define _PLACE_WORKER_LIST_HERE */ @@ -113,7 +113,7 @@ we-num_of_workers=num_of_workers; we-first_worker=worker_list[0]; -jk_log(l, JK_LOG_DEBUG, wc_open, done %d\n, num_of_workers); +jk_log(l, JK_LOG_DEBUG, wc_open, done %d %s\n, num_of_workers, worker_list[0]); return JK_TRUE; } 1.5 +11 -1 jakarta-tomcat-connectors/jk/native/common/jk_registry.c Index: jk_registry.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_registry.c 2001/11/11 01:17:43 1.4 +++ jk_registry.c 2001/11/16 22:59:06 1.5 @@ -62,7 +62,7 @@ /*** * Description: Worker list* - * Version: $Revision: 1.4 $ * + * Version: $Revision: 1.5 $ * ***/ /** Static declarations for all 'hardcoded' modules. This is a hack, @@ -102,6 +102,13 @@ jk_logger_t *l); #endif +/* Factories for 'new' types. We use the new factory interface, + * workers will be updated later + */ +int JK_METHOD jk_channel_socket_factory(jk_env_t *env, void **result, + char *type, char *name); + + /** * Init the components that we compile in by default. * In future we should have a more flexible mechanism that would allow @@ -122,6 +129,9 @@ #ifdef HAVE_JNI env-registerFactory( env, worker, jni, (void *)jni_worker_factory ); #endif + + env-registerFactory( env, channel, socket, + (void *)jk_channel_socket_factory ); /* env-registerFactory( env, channel, socket, jk_channel_socket_factory ); 1.13 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c Index: jk_ajp14_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jk_ajp14_worker.c 2001/11/07 21:50:53 1.12 +++ jk_ajp14_worker.c 2001/11/16 22:59:06 1.13 @@ -58,12 +58,11 @@ /*** * Description: AJP14 next generation Bi-directional protocol. * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.12 $ * + * Version: $Revision: 1.13 $ * ***/ #include jk_context.h #include jk_pool.h -#include jk_connect.h #include jk_util.h #include jk_msg_buff.h #include jk_ajp13.h 1.8 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c Index: jk_ajp13_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_ajp13_worker.c 2001/11/07 21:50:53 1.7 +++ jk_ajp13_worker.c 2001/11/16 22:59:06 1.8 @@ -60,11 +60,10 @@ * Author: Costin [EMAIL PROTECTED] * * Author: Gal
