mturk 2004/11/10 07:47:56
Modified: jk/native/common jk_ajp13_worker.c jk_ajp14.c jk_logger.h
Log:
Use new TRACE macros.
Revision Changes Path
1.17 +6 -6
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_ajp13_worker.c 10 Nov 2004 15:24:17 -0000 1.16
+++ jk_ajp13_worker.c 10 Nov 2004 15:47:56 -0000 1.17
@@ -30,6 +30,7 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
return (ajp_validate(pThis, props, we, l, AJP13_PROTO));
}
@@ -38,12 +39,14 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
return (ajp_init(pThis, props, we, l, AJP13_PROTO));
}
static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
return (ajp_destroy(pThis, l, AJP13_PROTO));
}
@@ -51,6 +54,7 @@
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
jk_endpoint_t **pend, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
return (ajp_get_endpoint(pThis, pend, l, AJP13_PROTO));
}
@@ -59,9 +63,7 @@
{
ajp_worker_t *aw = (ajp_worker_t *) malloc(sizeof(ajp_worker_t));
-#ifdef JK_TRACE
- jk_log(l, JK_LOG_TRACE, "enter ajp13_worker_factory\n");
-#endif
+ JK_TRACE_ENTER(l);
if (name == NULL || w == NULL) {
jk_log(l, JK_LOG_ERROR, "In ajp13_worker_factory, NULL
parameters\n");
return JK_FALSE;
@@ -103,8 +105,6 @@
aw->logon = NULL; /* No Logon on AJP13 */
*w = &aw->worker;
-#ifdef JK_TRACE
- jk_log(l, JK_LOG_TRACE, "exit ajp13_worker_factory\n");
-#endif
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
1.21 +32 -12 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
Index: jk_ajp14.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_ajp14.c 8 Oct 2004 07:50:39 -0000 1.20
+++ jk_ajp14.c 10 Nov 2004 15:47:56 -0000 1.21
@@ -34,11 +34,13 @@
void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
jk_md5((const unsigned char *)s->entropy,
(const unsigned char *)s->secret_key, s->computed_key);
jk_log(l, JK_LOG_DEBUG, "Into ajp14_compute_md5 (%s/%s) -> (%s)\n",
s->entropy, s->secret_key, s->computed_key);
+ JK_TRACE_EXIT(l);
}
@@ -54,8 +56,7 @@
int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_init_into_msgb\n");
-
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -80,6 +81,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -96,6 +98,8 @@
int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
+
if (jk_b_get_bytes
(msg, (unsigned char *)s->entropy, AJP14_ENTROPY_SEED_LEN) < 0) {
jk_log(l, JK_LOG_ERROR,
@@ -104,6 +108,7 @@
}
s->entropy[AJP14_ENTROPY_SEED_LEN] = 0; /* Just to have a CString */
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -119,7 +124,7 @@
int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_login_comp_into_msgb\n");
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -141,6 +146,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -160,6 +166,8 @@
unsigned long nego;
char *sname;
+ JK_TRACE_ENTER(l);
+
nego = jk_b_get_long(msg);
if (nego == 0xFFFFFFFF) {
@@ -187,6 +195,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -204,7 +213,7 @@
{
unsigned long status;
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_unmarshal_log_nok\n");
+ JK_TRACE_ENTER(l);
status = jk_b_get_long(msg);
@@ -216,6 +225,7 @@
jk_log(l, JK_LOG_INFO, "Can't Log with servlet engine - code %08lx",
status);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -232,9 +242,10 @@
int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_shutdown_into_msgb\n");
- /* To be on the safe side */
+ JK_TRACE_ENTER(l);
+
+ /* To be on the safe side */
jk_b_reset(msg);
/*
@@ -254,6 +265,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -269,8 +281,7 @@
{
unsigned long status;
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_unmarshal_shutdown_nok\n");
-
+ JK_TRACE_ENTER(l);
status = jk_b_get_long(msg);
if (status == 0xFFFFFFFF) {
@@ -281,6 +292,7 @@
jk_log(l, JK_LOG_INFO, "Can't shutdown servlet engine - code %08lx",
status);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -296,7 +308,7 @@
int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
jk_msg_buf_t *unk, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_unknown_packet_into_msgb\n");
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -323,6 +335,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -338,7 +351,7 @@
int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
char *virtual, jk_logger_t *l)
{
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_query_into_msgb\n");
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -358,6 +371,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -382,6 +396,7 @@
vname = (char *)jk_b_get_string(msg);
+ JK_TRACE_ENTER(l);
jk_log(l, JK_LOG_DEBUG,
"ajp14_unmarshal_context_info - get virtual %s for virtual %s\n",
vname, c->virtual);
@@ -458,6 +473,7 @@
}
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -481,7 +497,7 @@
jk_context_item_t *ci;
int i;
- jk_log(l, JK_LOG_DEBUG, "Into ajp14_marshal_context_state_into_msgb\n");
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -546,6 +562,7 @@
return JK_FALSE;
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -568,6 +585,7 @@
char *cname;
jk_context_item_t *ci;
+ JK_TRACE_ENTER(l);
/* get virtual name */
vname = (char *)jk_b_get_string(msg);
@@ -615,6 +633,7 @@
cname, ci->status);
}
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -630,5 +649,6 @@
int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
jk_context_t *c, jk_logger_t *l)
{
+ JK_TRACE_ENTER(l);
return (ajp14_unmarshal_context_state_reply(msg, c, l));
}
1.11 +5 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_logger.h 10 Nov 2004 15:09:17 -0000 1.10
+++ jk_logger.h 10 Nov 2004 15:47:56 -0000 1.11
@@ -78,8 +78,12 @@
*/
#if defined (DEBUG) || (_DEBUG)
#define JK_TRACE 1
+#define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, "enter " __FUNCTION__
"\n")
+#define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, "exit " __FUNCTION__
"\n")
#else
#define JK_TRACE 0
+#define JK_TRACE_ENTER(l)
+#define JK_TRACE_EXIT(l)
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
