Changeset 5554

Timestamp:

Feb 20, 2017 12:57:15 AM (7 years ago)

Author:

ming

Message:

Re #1994 (misc): Make the log's sender and thread width a compile-time configurable setting.

Thanks to Richard Mudgett for the suggestion.

Location:

pjproject/trunk/pjlib

Files:

• include/pj/config.h (modified) (1 diff)
• src/pj/log.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/config.h

@@ -470 +470 @@
 #ifndef PJ_LOG_INDENT_CHAR
 #   define PJ_LOG_INDENT_CHAR       '.'
+#endif
+
+/**
+ * Log sender width.
+ *
+ * Default: 22 (for 64-bit machines), 14 otherwise
+ */
+#ifndef PJ_LOG_SENDER_WIDTH
+#   if PJ_HAS_STDINT_H
+#       include <stdint.h>
+#       if (UINTPTR_MAX == 0xffffffffffffffff)
+#           define PJ_LOG_SENDER_WIDTH  22
+#       else
+#           define PJ_LOG_SENDER_WIDTH  14
+#       endif
+#   else
+#       define PJ_LOG_SENDER_WIDTH  14
+#   endif
+#endif
+
+/**
+ * Log thread name width.
+ *
+ * Default: 12
+ */
+#ifndef PJ_LOG_THREAD_WIDTH
+#   define PJ_LOG_THREAD_WIDTH      12
 #endif
 

pjproject/trunk/pjlib/src/pj/log.c

@@ -381 +381 @@
     }
     if (log_decor & PJ_LOG_HAS_SENDER) {
-        enum { SENDER_WIDTH = 14 };
+        enum { SENDER_WIDTH = PJ_LOG_SENDER_WIDTH };
         pj_size_t sender_len = strlen(sender);
         if (pre!=log_buffer) *pre++ = ' ';
@@ -396 +396 @@
     }
     if (log_decor & PJ_LOG_HAS_THREAD_ID) {
-        enum { THREAD_WIDTH = 12 };
+        enum { THREAD_WIDTH = PJ_LOG_THREAD_WIDTH };
         const char *thread_name = pj_thread_get_name(pj_thread_this());
         pj_size_t thread_len = strlen(thread_name);