mturk 2004/11/11 11:11:56
Modified: jk/native/common jk_uri_worker_map.c jk_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision Changes Path
1.28 +20 -7
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_uri_worker_map.c 11 Nov 2004 09:45:23 -0000 1.27
+++ jk_uri_worker_map.c 11 Nov 2004 19:11:55 -0000 1.28
@@ -136,13 +136,16 @@
JK_TRACE_ENTER(l);
if (init_data && uw_map) {
- return uri_worker_map_open(*uw_map =
- (jk_uri_worker_map_t *)
- malloc(sizeof(jk_uri_worker_map_t)),
- init_data, l);
+ int rc = uri_worker_map_open(*uw_map =
+ (jk_uri_worker_map_t *)
+ malloc(sizeof(jk_uri_worker_map_t)),
+ init_data, l);
+ JK_TRACE_EXIT(l);
+ return rc;
}
JK_LOG_NULL_PARAMS(l);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -161,6 +164,7 @@
else
JK_LOG_NULL_PARAMS(l);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -204,9 +208,10 @@
char *worker;
JK_TRACE_ENTER(l);
- if (uri_worker_map_realloc(uw_map) == JK_FALSE)
+ if (uri_worker_map_realloc(uw_map) == JK_FALSE) {
+ JK_TRACE_EXIT(l);
return JK_FALSE;
-
+ }
uwr =
(uri_worker_record_t *) jk_pool_alloc(&uw_map->p,
sizeof(uri_worker_record_t));
@@ -214,6 +219,7 @@
if (!uwr) {
jk_log(l, JK_LOG_ERROR,
"can't alloc map entry\n");
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -223,6 +229,7 @@
if (!uri || !worker) {
jk_log(l, JK_LOG_ERROR,
"can't alloc uri/worker strings\n");
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -235,6 +242,7 @@
if (!uwr->uri) {
jk_log(l, JK_LOG_ERROR,
"can't alloc uri string\n");
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -326,6 +334,7 @@
jk_log(l, JK_LOG_ERROR,
"invalid context %s\n",
uri);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -423,6 +432,7 @@
}
JK_LOG_NULL_PARAMS(l);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -482,6 +492,7 @@
jk_log(l, JK_LOG_DEBUG,
"Found an exact match %s -> %s\n",
uwr->worker_name, uwr->context);
+ JK_TRACE_EXIT(l);
return uwr->worker_name;
}
}
@@ -554,6 +565,7 @@
}
if (-1 != best_match) {
+ JK_TRACE_EXIT(l);
return uw_map->maps[best_match]->worker_name;
}
else {
@@ -571,6 +583,7 @@
jk_log(l, JK_LOG_EMERG,
"Found a security fraud in '%s'\n",
uri);
+ JK_TRACE_EXIT(l);
return uw_map->maps[fraud]->worker_name;
}
}
1.23 +16 -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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_worker.c 11 Nov 2004 09:45:23 -0000 1.22
+++ jk_worker.c 11 Nov 2004 19:11:56 -0000 1.23
@@ -43,15 +43,18 @@
JK_TRACE_ENTER(l);
if (!jk_map_alloc(&worker_map)) {
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!jk_get_worker_list(init_data, &worker_list, &num_of_workers)) {
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!build_worker_map(init_data, worker_list, num_of_workers, we, l)) {
close_workers(l);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -75,15 +78,15 @@
JK_TRACE_ENTER(l);
if (!name) {
- jk_log(l, JK_LOG_ERROR, "wc_get_worker_for_name NULL name\n");
+ JK_LOG_NULL_PARAMS(l);
+ JK_TRACE_EXIT(l);
+ return NULL;
}
- jk_log(l, JK_LOG_DEBUG, "Into wc_get_worker_for_name %s\n", name);
-
rc = jk_map_get(worker_map, name, NULL);
- jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s a worker\n",
- rc ? "found" : "did not find");
+ jk_log(l, JK_LOG_DEBUG, "%s a worker %s\n",
+ rc ? "found" : "did not find", name);
JK_TRACE_EXIT(l);
return rc;
}
@@ -105,6 +108,7 @@
if (!fac) {
jk_log(l, JK_LOG_ERROR, "NULL factory for %s\n",
type);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -116,6 +120,7 @@
jk_log(l, JK_LOG_ERROR,
"factory for %s failed for %s\n", type,
name);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -125,6 +130,7 @@
w->destroy(&w, l);
jk_log(l, JK_LOG_ERROR,
"validate failed for %s\n", name);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -132,6 +138,7 @@
w->destroy(&w, l);
jk_log(l, JK_LOG_ERROR, "init failed for %s\n",
name);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -162,8 +169,8 @@
}
}
}
- JK_TRACE_EXIT(l);
jk_map_free(&worker_map);
+ JK_TRACE_EXIT(l);
}
static int build_worker_map(jk_map_t *init_data,
@@ -185,6 +192,7 @@
jk_worker_t *oldw = NULL;
if (!jk_map_put(worker_map, worker_list[i], w, (void *)&oldw)) {
w->destroy(&w, l);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -199,6 +207,7 @@
jk_log(l, JK_LOG_ERROR,
"failed to create worker%s\n",
worker_list[i]);
+ JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
