mturk 2004/11/11 01:44:30
Modified: jk/native/common jk_logger.h jk_util.c jk_util.h
Log:
Add __FUNCTION__ as parameter for jk_log.
The function name will be expanded for GCC and MSVC.
Other compilers like CW does not expand function name.
Revision Changes Path
1.14 +19 -11 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_logger.h 10 Nov 2004 16:36:48 -0000 1.13
+++ jk_logger.h 11 Nov 2004 09:44:29 -0000 1.14
@@ -66,27 +66,35 @@
#define JK_LOG_ERROR_VERB "error"
#define JK_LOG_EMERG_VERB "emerg"
-#define JK_LOG_TRACE __FILE__,__LINE__,JK_LOG_TRACE_LEVEL
-#define JK_LOG_DEBUG __FILE__,__LINE__,JK_LOG_DEBUG_LEVEL
-#define JK_LOG_INFO __FILE__,__LINE__,JK_LOG_INFO_LEVEL
-#define JK_LOG_WARNING __FILE__,__LINE__,JK_LOG_WARNING_LEVEL
-#define JK_LOG_ERROR __FILE__,__LINE__,JK_LOG_ERROR_LEVEL
-#define JK_LOG_EMERG __FILE__,__LINE__,JK_LOG_EMERG_LEVEL
-#define JK_LOG_REQUEST __FILE__,0,JK_LOG_REQUEST_LEVEL
+#if defined(__GCC__) || defined(_MSC_VER)
+#define JK_LOG_TRACE __FILE__,__LINE__,__FUNCTION__,JK_LOG_TRACE_LEVEL
+#define JK_LOG_DEBUG __FILE__,__LINE__,__FUNCTION__,JK_LOG_DEBUG_LEVEL
+#define JK_LOG_ERROR __FILE__,__LINE__,__FUNCTION__,JK_LOG_ERROR_LEVEL
+#define JK_LOG_EMERG __FILE__,__LINE__,__FUNCTION__,JK_LOG_EMERG_LEVEL
+#else
+#define JK_LOG_TRACE __FILE__,__LINE__,NULL,JK_LOG_TRACE_LEVEL
+#define JK_LOG_DEBUG __FILE__,__LINE__,NULL,JK_LOG_DEBUG_LEVEL
+#define JK_LOG_ERROR __FILE__,__LINE__,NULL,JK_LOG_ERROR_LEVEL
+#define JK_LOG_EMERG __FILE__,__LINE__,NULL,JK_LOG_EMERG_LEVEL
+#endif
+
+#define JK_LOG_INFO __FILE__,__LINE__,NULL,JK_LOG_INFO_LEVEL
+#define JK_LOG_WARNING __FILE__,__LINE__,NULL,JK_LOG_WARNING_LEVEL
+#define JK_LOG_REQUEST __FILE__,0,NULL,JK_LOG_REQUEST_LEVEL
/* Debug level is compile time only
*/
#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")
+#define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, "enter\n")
+#define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, "exit\n")
#else
#define JK_TRACE 0
#define JK_TRACE_ENTER(l)
#define JK_TRACE_EXIT(l)
#endif
-#define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, __FUNCTION__ " NULL
parameters\n")
+#define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, "NULL parameters\n")
1.34 +3 -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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_util.c 9 Nov 2004 12:17:43 -0000 1.33
+++ jk_util.c 11 Nov 2004 09:44:29 -0000 1.34
@@ -218,7 +218,8 @@
}
int jk_log(jk_logger_t *l,
- const char *file, int line, int level, const char *fmt, ...)
+ const char *file, int line, const char *funcname, int level,
+ const char *fmt, ...)
{
int rc = 0;
if (!l || !file || !fmt) {
1.20 +3 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_util.h 10 Nov 2004 16:36:48 -0000 1.19
+++ jk_util.h 11 Nov 2004 09:44:29 -0000 1.20
@@ -36,7 +36,8 @@
int jk_close_file_logger(jk_logger_t **l);
int jk_log(jk_logger_t *l,
- const char *file, int line, int level, const char *fmt, ...);
+ const char *file, int line, const char *funcname, int level,
+ const char *fmt, ...);
/* [V] Two general purpose functions. Should ease the function bloat. */
int jk_get_worker_str_prop(jk_map_t *m,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
