mturk 2004/11/10 08:28:31
Modified: jk/native/common jk_connect.c jk_lb_worker.c jk_logger.h
jk_msg_buff.c jk_pool.c jk_uri_worker_map.c
jk_worker.c
Log:
Use new TRACE macros and __FUNCTION__ builtins
Revision Changes Path
1.29 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_connect.c 8 Nov 2004 13:39:27 -0000 1.28
+++ jk_connect.c 10 Nov 2004 16:28:31 -0000 1.29
@@ -140,7 +140,7 @@
char buf[32];
int sock;
- jk_log(l, JK_LOG_DEBUG, "Into jk_open_socket\n");
+ JK_TRACE_ENTER(l);
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock >= 0) {
@@ -234,6 +234,7 @@
"jk_open_socket, socket() failed errno = %d\n", errno);
}
+ JK_TRACE_EXIT(l);
return sock;
}
1.26 +44 -54 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_lb_worker.c 8 Nov 2004 13:42:23 -0000 1.25
+++ jk_lb_worker.c 10 Nov 2004 16:28:31 -0000 1.26
@@ -274,7 +274,7 @@
jk_ws_service_t *s,
jk_logger_t *l, int *is_recoverable_error)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::service\n");
+ JK_TRACE_ENTER(l);
if (e && e->endpoint_private && s && is_recoverable_error) {
lb_endpoint_t *p = e->endpoint_private;
@@ -290,7 +290,7 @@
jk_b_reset(s->reco_buf);
s->reco_status = RECO_INITED;
jk_log(l, JK_LOG_DEBUG,
- "Into jk_endpoint_t::service sticky_session=%d\n",
+ __FUNCTION__ "::service sticky_session=%d\n",
p->worker->sticky_session);
while (1) {
@@ -305,8 +305,8 @@
rc = rec->w->get_endpoint(rec->w, &end, l);
- jk_log(l, JK_LOG_INFO,
- "Into jk_endpoint_t::service worker=%s jvm_route=%s
rc=%d\n",
+ jk_log(l, JK_LOG_DEBUG,
+ __FUNCTION__ "::service worker=%s jvm_route=%s
rc=%d\n",
rec->name, s->jvm_route, rc);
if (rc && end) {
@@ -316,6 +316,7 @@
rec->in_error_state = JK_FALSE;
rec->in_recovering = JK_FALSE;
rec->error_time = 0;
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
}
@@ -344,7 +345,7 @@
* another worker... Lets try to do that.
*/
jk_log(l, JK_LOG_DEBUG,
- "lb: recoverable error... will try to recover on
other host\n");
+ __FUNCTION__ "::recoverable error...
will try to recover on other host\n");
}
else {
/* NULL record, no more workers left ... */
@@ -357,13 +358,12 @@
}
jk_log(l, JK_LOG_ERROR, "lb: end of service with error\n");
-
return JK_FALSE;
}
static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::done\n");
+ JK_TRACE_ENTER(l);
if (e && *e && (*e)->endpoint_private) {
lb_endpoint_t *p = (*e)->endpoint_private;
@@ -374,10 +374,11 @@
free(p);
*e = NULL;
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
- jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::done: NULL Parameters\n");
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -386,7 +387,7 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::validate\n");
+ JK_TRACE_ENTER(l);
if (pThis && pThis->worker_private) {
lb_worker_t *p = pThis->worker_private;
@@ -476,13 +477,13 @@
"local_worker_only: %s\n",
(p->local_worker_only ? "true" : "false"));
p->num_of_workers = num_of_workers;
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
}
}
- jk_log(l, JK_LOG_ERROR, "In jk_worker_t::validate: NULL Parameters\n");
-
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -497,26 +498,22 @@
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
jk_endpoint_t **pend, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::get_endpoint\n");
+ JK_TRACE_ENTER(l);
if (pThis && pThis->worker_private && pend) {
lb_endpoint_t *p = (lb_endpoint_t *) malloc(sizeof(lb_endpoint_t));
- if (p) {
- p->e = NULL;
- p->worker = pThis->worker_private;
- p->endpoint.endpoint_private = p;
- p->endpoint.service = service;
- p->endpoint.done = done;
- *pend = &p->endpoint;
+ p->e = NULL;
+ p->worker = pThis->worker_private;
+ p->endpoint.endpoint_private = p;
+ p->endpoint.service = service;
+ p->endpoint.done = done;
+ *pend = &p->endpoint;
- return JK_TRUE;
- }
- jk_log(l, JK_LOG_ERROR,
- "In jk_worker_t::get_endpoint, malloc failed\n");
+ JK_TRACE_EXIT(l);
+ return JK_TRUE;
}
else {
- jk_log(l, JK_LOG_ERROR,
- "In jk_worker_t::get_endpoint, NULL parameters\n");
+ JK_LOG_NULL_PARAMS(l);
}
return JK_FALSE;
@@ -524,7 +521,7 @@
static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::destroy\n");
+ JK_TRACE_ENTER(l);
if (pThis && *pThis && (*pThis)->worker_private) {
lb_worker_t *private_data = (*pThis)->worker_private;
@@ -534,50 +531,43 @@
jk_close_pool(&private_data->p);
free(private_data);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
- jk_log(l, JK_LOG_ERROR, "In jk_worker_t::destroy, NULL parameters\n");
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
int JK_METHOD lb_worker_factory(jk_worker_t **w,
const char *name, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into lb_worker_factory\n");
+ JK_TRACE_ENTER(l);
if (NULL != name && NULL != w) {
lb_worker_t *private_data =
(lb_worker_t *) malloc(sizeof(lb_worker_t));
- if (private_data) {
-
- jk_open_pool(&private_data->p,
- private_data->buf,
- sizeof(jk_pool_atom_t) * TINY_POOL_SIZE);
-
- private_data->name = jk_pool_strdup(&private_data->p, name);
-
- if (private_data->name) {
- private_data->lb_workers = NULL;
- private_data->num_of_workers = 0;
- private_data->worker.worker_private = private_data;
- private_data->worker.validate = validate;
- private_data->worker.init = init;
- private_data->worker.get_endpoint = get_endpoint;
- private_data->worker.destroy = destroy;
+ jk_open_pool(&private_data->p,
+ private_data->buf,
+ sizeof(jk_pool_atom_t) * TINY_POOL_SIZE);
+
+ private_data->name = jk_pool_strdup(&private_data->p, name);
+
+ private_data->lb_workers = NULL;
+ private_data->num_of_workers = 0;
+ private_data->worker.worker_private = private_data;
+ private_data->worker.validate = validate;
+ private_data->worker.init = init;
+ private_data->worker.get_endpoint = get_endpoint;
+ private_data->worker.destroy = destroy;
- *w = &private_data->worker;
- return JK_TRUE;
- }
-
- jk_close_pool(&private_data->p);
- free(private_data);
- }
- jk_log(l, JK_LOG_ERROR, "In lb_worker_factory, malloc failed\n");
+ *w = &private_data->worker;
+ JK_TRACE_EXIT(l);
+ return JK_TRUE;
}
else {
- jk_log(l, JK_LOG_ERROR, "In lb_worker_factory, NULL parameters\n");
+ JK_LOG_NULL_PARAMS(l);
}
return JK_FALSE;
1.12 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_logger.h
Index: jk_logger.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_logger.h 10 Nov 2004 15:47:56 -0000 1.11
+++ jk_logger.h 10 Nov 2004 16:28:31 -0000 1.12
@@ -86,6 +86,8 @@
#define JK_TRACE_EXIT(l)
#endif
+#define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, __FUNCTION__ " NULL
parameters\n")
+
#ifdef __cplusplus
1.19 +7 -7 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_msg_buff.c 8 Oct 2004 07:50:39 -0000 1.18
+++ jk_msg_buff.c 10 Nov 2004 16:28:31 -0000 1.19
@@ -44,7 +44,7 @@
* Simple marshaling code.
*/
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
static void jk_b_dump(jk_msg_buf_t *msg, char *err)
{
int i = 0;
@@ -278,7 +278,7 @@
{
unsigned long i;
if (msg->pos + 3 > msg->len) {
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
fprintf(stderr, "jk_b_get_long::Read after end \n");
#endif
return 0xFFFFFFFF;
@@ -305,7 +305,7 @@
{
unsigned short i;
if (msg->pos + 1 > msg->len) {
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
fprintf(stderr, "jk_b_get_int::Read after end \n");
#endif
return 0xFFFF;
@@ -327,7 +327,7 @@
{
unsigned char rc;
if (msg->pos > msg->len) {
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
fprintf(stderr, "jk_b_get_byte::Read after end \n");
#endif
return 0xFF;
@@ -349,7 +349,7 @@
int start = msg->pos;
if ((size == 0xFFFF) || (size + start > msg->maxlen)) {
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
jk_b_dump(msg, "After get int");
fprintf(stderr, "ERROR\n");
#endif
@@ -367,7 +367,7 @@
int start = msg->pos;
if ((len < 0) || (len + start > msg->maxlen)) {
-#ifdef DEBUG
+#if defined (DEBUG) || (_DEBUG)
jk_b_dump(msg, "After get bytes");
fprintf(stderr, "ERROR\n");
#endif
1.10 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_pool.c 8 Oct 2004 07:50:39 -0000 1.9
+++ jk_pool.c 10 Nov 2004 16:28:31 -0000 1.10
@@ -114,6 +114,7 @@
return rc;
}
+#if defined (DEBUG) || (_DEBUG)
void jk_dump_pool(jk_pool_t *p, FILE * f)
{
fprintf(f, "Dumping for pool [%p]\n", p);
@@ -126,6 +127,7 @@
fflush(f);
}
+#endif
static void *jk_pool_dyn_alloc(jk_pool_t *p, size_t size)
{
1.25 +15 -18
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_uri_worker_map.c 9 Nov 2004 12:17:43 -0000 1.24
+++ jk_uri_worker_map.c 10 Nov 2004 16:28:31 -0000 1.25
@@ -133,8 +133,7 @@
int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map,
jk_map_t *init_data, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG,
- "Into jk_uri_worker_map_t::uri_worker_map_alloc\n");
+ JK_TRACE_ENTER(l);
if (init_data && uw_map) {
return uri_worker_map_open(*uw_map =
@@ -144,25 +143,25 @@
}
jk_log(l, JK_LOG_ERROR,
- "In jk_uri_worker_map_t::uri_worker_map_alloc, NULL
parameters\n");
+ __FUNCTION__ "::uri_worker_map_alloc, NULL parameters\n");
return JK_FALSE;
}
int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG,
- "Into jk_uri_worker_map_t::uri_worker_map_free\n");
+ JK_TRACE_ENTER(l);
if (uw_map && *uw_map) {
uri_worker_map_close(*uw_map, l);
free(*uw_map);
*uw_map = NULL;
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
else
jk_log(l, JK_LOG_ERROR,
- "In jk_uri_worker_map_t::uri_worker_map_free, NULL
parameters\n");
+ __FUNCTION__ "::uri_worker_map_free, NULL parameters\n");
return JK_FALSE;
}
@@ -206,6 +205,7 @@
char *uri;
char *worker;
+ JK_TRACE_ENTER(l);
if (uri_worker_map_realloc(uw_map) == JK_FALSE)
return JK_FALSE;
@@ -338,6 +338,7 @@
uw_map->maps[uw_map->size] = uwr;
uw_map->size++;
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -346,8 +347,7 @@
{
int rc = JK_TRUE;
- jk_log(l, JK_LOG_DEBUG,
- "Into jk_uri_worker_map_t::uri_worker_map_open\n");
+ JK_TRACE_ENTER(l);
uw_map->size = 0;
uw_map->capacity = 0;
@@ -401,8 +401,7 @@
}
}
- jk_log(l, JK_LOG_DEBUG,
- "jk_uri_worker_map_t::uri_worker_map_open, done\n");
+ JK_TRACE_EXIT(l);
return rc;
}
@@ -420,12 +419,12 @@
int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG,
- "Into jk_uri_worker_map_t::uri_worker_map_close\n");
+ JK_TRACE_ENTER(l);
if (uw_map) {
jk_close_pool(&uw_map->p);
jk_close_pool(&uw_map->tp);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -464,7 +463,7 @@
char *map_uri_to_worker(jk_uri_worker_map_t *uw_map,
char *uri, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into jk_uri_worker_map_t::map_uri_to_worker\n");
+ JK_TRACE_ENTER(l);
if (uw_map && uri && '/' == uri[0]) {
unsigned i;
@@ -595,11 +594,9 @@
}
else {
jk_log(l, JK_LOG_ERROR,
- "In jk_uri_worker_map_t::map_uri_to_worker, wrong
parameters\n");
+ __FUNCTION__ "::map_uri_to_worker, wrong parameters\n");
}
- jk_log(l, JK_LOG_DEBUG,
- "jk_uri_worker_map_t::map_uri_to_worker, done without a match\n");
-
+ JK_TRACE_EXIT(l);
return NULL;
}
1.20 +23 -21 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_worker.c 9 Nov 2004 12:17:43 -0000 1.19
+++ jk_worker.c 10 Nov 2004 16:28:31 -0000 1.20
@@ -40,7 +40,7 @@
char **worker_list = NULL;
unsigned num_of_workers = 0;
- jk_log(l, JK_LOG_DEBUG, "Into wc_open\n");
+ JK_TRACE_ENTER(l);
if (!jk_map_alloc(&worker_map)) {
return JK_FALSE;
@@ -57,22 +57,23 @@
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_TRACE_EXIT(l);
return JK_TRUE;
}
void wc_close(jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into wc_close\n");
+ JK_TRACE_ENTER(l);
close_workers(l);
- jk_log(l, JK_LOG_DEBUG, "wc_close, done\n");
+ JK_TRACE_EXIT(l);
}
jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l)
{
jk_worker_t *rc;
+ JK_TRACE_ENTER(l);
if (!name) {
jk_log(l, JK_LOG_ERROR, "wc_get_worker_for_name NULL name\n");
}
@@ -83,6 +84,7 @@
jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s a worker\n",
rc ? "found" : "did not find");
+ JK_TRACE_EXIT(l);
return rc;
}
@@ -91,7 +93,7 @@
jk_map_t *init_data,
jk_worker_t **rc, jk_worker_env_t *we, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into wc_create_worker\n");
+ JK_TRACE_ENTER(l);
if (rc) {
char *type = jk_get_worker_type(init_data, name);
@@ -101,44 +103,44 @@
*rc = NULL;
if (!fac) {
- jk_log(l, JK_LOG_ERROR, "wc_create_worker NULL factory for %s\n",
+ jk_log(l, JK_LOG_ERROR, __FUNCTION__ " NULL factory for %s\n",
type);
return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG,
- "wc_create_worker, about to create instance %s of %s\n", name,
+ __FUNCTION__ " about to create instance %s of %s\n", name,
type);
if (!fac(&w, name, l) || !w) {
jk_log(l, JK_LOG_ERROR,
- "wc_create_worker factory for %s failed for %s\n", type,
+ __FUNCTION__ " factory for %s failed for %s\n", type,
name);
return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG,
- "wc_create_worker, about to validate and init %s\n", name);
+ __FUNCTION__ " about to validate and init %s\n", name);
if (!w->validate(w, init_data, we, l)) {
w->destroy(&w, l);
jk_log(l, JK_LOG_ERROR,
- "wc_create_worker validate failed for %s\n", name);
+ __FUNCTION__ " validate failed for %s\n", name);
return JK_FALSE;
}
if (!w->init(w, init_data, we, l)) {
w->destroy(&w, l);
- jk_log(l, JK_LOG_ERROR, "wc_create_worker init failed for %s\n",
+ jk_log(l, JK_LOG_ERROR, __FUNCTION__ " init failed for %s\n",
name);
return JK_FALSE;
}
*rc = w;
- jk_log(l, JK_LOG_DEBUG, "wc_create_worker, done\n");
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
- jk_log(l, JK_LOG_ERROR, "wc_create_worker, NUll input\n");
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -146,7 +148,7 @@
{
int sz = jk_map_size(worker_map);
- jk_log(l, JK_LOG_DEBUG, "close_workers got %d workers to destroy\n", sz);
+ JK_TRACE_ENTER(l);
if (sz > 0) {
int i;
@@ -160,6 +162,7 @@
}
}
}
+ JK_TRACE_EXIT(l);
jk_map_free(&worker_map);
}
@@ -170,14 +173,13 @@
{
unsigned i;
- jk_log(l, JK_LOG_DEBUG,
- "Into build_worker_map, creating %d workers\n", num_of_workers);
+ JK_TRACE_ENTER(l);
for (i = 0; i < num_of_workers; i++) {
jk_worker_t *w = NULL;
jk_log(l, JK_LOG_DEBUG,
- "build_worker_map, creating worker %s\n", worker_list[i]);
+ __FUNCTION__ " creating worker %s\n", worker_list[i]);
if (wc_create_worker(worker_list[i], init_data, &w, we, l)) {
jk_worker_t *oldw = NULL;
@@ -187,7 +189,7 @@
}
jk_log(l, JK_LOG_DEBUG,
- "build_worker_map, removing old %s worker \n",
+ __FUNCTION__ " removing old %s worker \n",
worker_list[i]);
if (oldw) {
oldw->destroy(&oldw, l);
@@ -195,13 +197,13 @@
}
else {
jk_log(l, JK_LOG_ERROR,
- "build_worker_map failed to create worker%s\n",
+ __FUNCTION__ " failed to create worker%s\n",
worker_list[i]);
return JK_FALSE;
}
}
- jk_log(l, JK_LOG_DEBUG, "build_worker_map, done\n");
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
