You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/17 07:51:48 UTC
svn commit: r612738 - in /logging/log4cxx/trunk/src: main/cpp/ main/include/log4cxx/private/ test/cpp/ test/cpp/util/

Author: carnold
Date: Wed Jan 16 22:51:44 2008
New Revision: 612738

URL: http://svn.apache.org/viewvc?rev=612738&view=rev
Log:
LOGCXX-221: Make ThreadID format configurable

Modified:
    logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
    logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.h.in
    logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw
    logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
    logging/log4cxx/trunk/src/test/cpp/util/threadfilter.cpp
    logging/log4cxx/trunk/src/test/cpp/util/xmlthreadfilter.cpp

Modified: logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp Wed Jan 16 22:51:44 2008
@@ -36,6 +36,7 @@
 #include <log4cxx/helpers/objectoutputstream.h>
 #include <log4cxx/helpers/bytebuffer.h>
 #include <log4cxx/logger.h>
+#include <log4cxx/private/log4cxx_private.h>
 
 using namespace log4cxx;
 using namespace log4cxx::spi;
@@ -205,14 +206,13 @@
 #if defined(_WIN32)
    char result[20];
    DWORD threadId = GetCurrentThreadId();
-   apr_snprintf(result, sizeof(result), "0x%.8x", threadId);
+   apr_snprintf(result, sizeof(result), LOG4CXX_WIN32_THREAD_FMTSPEC, threadId);
 #else
    // apr_os_thread_t encoded in HEX takes needs as many characters
-   // as two times the size of the type, plus an additional null byte
-   char result[sizeof(apr_os_thread_t) * 2 + 10];
-   result[0] = '0';
-   result[1] = 'x';   apr_os_thread_t threadId = apr_os_thread_current();
-   apr_snprintf(result+2, (sizeof result) - 2, "%pt", (void*) &threadId);
+   // as two times the size of the type, plus an additional null byte.
+   char result[sizeof(apr_os_thread_t) * 3 + 10];
+   apr_os_thread_t threadId = apr_os_thread_current();
+   apr_snprintf(result, sizeof(result), LOG4CXX_APR_THREAD_FMTSPEC, (void*) &threadId);
 #endif
    LOG4CXX_DECODE_CHAR(str, (const char*) result);
    return str;

Modified: logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.h.in
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.h.in?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.h.in (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.h.in Wed Jan 16 22:51:44 2008
@@ -48,4 +48,8 @@
 #define LOG4CXX_HAVE_SYSLOG @HAS_SYSLOG@
 #define LOG4CXX_HAVE_ODBC @HAS_ODBC@
 
+#define LOG4CXX_WIN32_THREAD_FMTSPEC "0x%.8x"
+#define LOG4CXX_APR_THREAD_FMTSPEC "0x%pt"
+
+
 #endif

Modified: logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw Wed Jan 16 22:51:44 2008
@@ -82,4 +82,7 @@
 #define LOG4CXX_HAVE_LIBESMTP 0
 #define LOG4CXX_HAVE_SYSLOG 0
 
+#define LOG4CXX_WIN32_THREAD_FMTSPEC "0x%.8x"
+#define LOG4CXX_APR_THREAD_FMTSPEC "0x%pt"
+
 #endif

Modified: logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp Wed Jan 16 22:51:44 2008
@@ -45,16 +45,16 @@
 
 
 #define REGEX_STR(x) x
-#define PAT0 REGEX_STR("\\[0x[0-9A-F]*]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message [0-9]\\{1,2\\}")
+#define PAT0 REGEX_STR("\\[0\\?x\\?[0-9A-F]+]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message [0-9]\\{1,2\\}")
 #define PAT1 ISO8601_PAT REGEX_STR(" ") PAT0
 #define PAT2 ABSOLUTE_DATE_AND_TIME_PAT REGEX_STR(" ") PAT0
 #define PAT3 ABSOLUTE_TIME_PAT REGEX_STR(" ") PAT0
 #define PAT4 RELATIVE_TIME_PAT REGEX_STR(" ") PAT0
-#define PAT5 REGEX_STR("\\[0x[0-9A-F]*]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* : Message [0-9]\\{1,2\\}")
-#define PAT6 REGEX_STR("\\[0x[0-9A-F]*]\\ (DEBUG|INFO |WARN |ERROR|FATAL) .*patternlayouttest.cpp\\([0-9]\\{1,4\\}\\): Message [0-9]\\{1,3\\}")
-#define PAT11a REGEX_STR("^(DEBUG|INFO |WARN |ERROR|FATAL) \\[0x[0-9A-F]*]\\ log4j.PatternLayoutTest: Message [0-9]\\{1,2\\}")
-#define PAT11b REGEX_STR("^(DEBUG|INFO |WARN |ERROR|FATAL) \\[0x[0-9A-F]*]\\ root: Message [0-9]\\{1,2\\}")
-#define PAT12 REGEX_STR("^\\[0x[0-9A-F]*]\\ (DEBUG|INFO |WARN |ERROR|FATAL) ")\
+#define PAT5 REGEX_STR("\\[0\\?x\\?[0-9A-F]+]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* : Message [0-9]\\{1,2\\}")
+#define PAT6 REGEX_STR("\\[0\\?x\\?[0-9A-F]+]\\ (DEBUG|INFO |WARN |ERROR|FATAL) .*patternlayouttest.cpp\\([0-9]\\{1,4\\}\\): Message [0-9]\\{1,3\\}")
+#define PAT11a REGEX_STR("^(DEBUG|INFO |WARN |ERROR|FATAL) \\[0\\?x\\?[0-9A-F]+]\\ log4j.PatternLayoutTest: Message [0-9]\\{1,2\\}")
+#define PAT11b REGEX_STR("^(DEBUG|INFO |WARN |ERROR|FATAL) \\[0\\?x\\?[0-9A-F]+]\\ root: Message [0-9]\\{1,2\\}")
+#define PAT12 REGEX_STR("^\\[0\\?x\\?[0-9A-F]+]\\ (DEBUG|INFO |WARN |ERROR|FATAL) ")\
     REGEX_STR(".*patternlayouttest.cpp([0-9]\\{1,4\\}): ")\
     REGEX_STR("Message [0-9]\\{1,2\\}")
 #define PAT_MDC_1 REGEX_STR("")
@@ -285,8 +285,8 @@
                 filter1 << PAT4;
                 //
                 //   combo of relative time and thread identifier
-                //     (the \\\\1 preserve a leading space)
-                Filter filter2(".*0x[0-9A-Fa-f]*]", "[main]");
+                //     
+                Filter filter2(".*]", "[main]");
 
                 std::vector<Filter *> filters;
 

Modified: logging/log4cxx/trunk/src/test/cpp/util/threadfilter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/util/threadfilter.cpp?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/util/threadfilter.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/util/threadfilter.cpp Wed Jan 16 22:51:44 2008
@@ -20,4 +20,4 @@
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 
-ThreadFilter::ThreadFilter() : Filter("\\[0x[0-9A-Fa-f]*]", "\\[main]") {}
+ThreadFilter::ThreadFilter() : Filter("\\[0\\?x\\?[0-9A-Fa-f]\\+]", "\\[main]") {}

Modified: logging/log4cxx/trunk/src/test/cpp/util/xmlthreadfilter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/util/xmlthreadfilter.cpp?rev=612738&r1=612737&r2=612738&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/util/xmlthreadfilter.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/util/xmlthreadfilter.cpp Wed Jan 16 22:51:44 2008
@@ -21,5 +21,5 @@
 using namespace log4cxx::helpers;
 
 XMLThreadFilter::XMLThreadFilter()
-     : Filter("0x[0-9A-Fa-f]*", "main") {
+     : Filter("thread=\\\"0\\?x\\?[0-9A-Fa-f]\\+", "thread=\\\"main") {
 }