/hg/icedtea-web: Synced headers between PLUGIN_DEBUG, PLUGIN_ERR...

[jvanek at icedtea.classpath.org]

changeset 6a7915fdff8c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6a7915fdff8c
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Nov 01 13:23:25 2013 +0100

	Synced headers between PLUGIN_DEBUG, PLUGIN_ERROR and javaside
	* netx/net/sourceforge/jnlp/util/logging/OutputController.java: (getHeader) added thread id and name to log header.
	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG) (PLUGIN_ERROR) headerrs generation code moved to macro (CREATE_HEADER0). Both headers now contains pthread_self and g_thread_self. Fixed indentation.


diffstat:

 ChangeLog                                                    |   9 +
 netx/net/sourceforge/jnlp/util/logging/OutputController.java |   4 +
 plugin/icedteanp/IcedTeaPluginUtils.h                        |  73 ++++++-----
 3 files changed, 51 insertions(+), 35 deletions(-)

diffs (115 lines):

diff -r e6ba4b4dea45 -r 6a7915fdff8c ChangeLog
--- a/ChangeLog	Fri Nov 01 11:08:06 2013 +0100
+++ b/ChangeLog	Fri Nov 01 13:23:25 2013 +0100
@@ -1,3 +1,12 @@
+2013-11-01  Jiri Vanek  <jvanek at redhat.com>
+
+	Synced headers between PLUGIN_DEBUG, PLUGIN_ERROR and javaside
+	* netx/net/sourceforge/jnlp/util/logging/OutputController.java: (getHeader)
+	added thread id and name to log header.
+	* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_DEBUG) (PLUGIN_ERROR) 
+	headerrs generation code moved to macro (CREATE_HEADER0). Both
+	headers now contains pthread_self and g_thread_self. Fixed indentation.
+
 2013-11-01  Jiri Vanek  <jvanek at redhat.com>
 
 	* tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java:
diff -r e6ba4b4dea45 -r 6a7915fdff8c netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Fri Nov 01 11:08:06 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java	Fri Nov 01 13:23:25 2013 +0100
@@ -346,6 +346,10 @@
             if (stack != null) {
                 sb.append('[').append(getCallerClass(stack)).append(']');
             }
+            sb.append(" NETX Thread# ")
+                    .append(Integer.toHexString(((Object)Thread.currentThread()).hashCode()))
+                    .append(", name ")
+                    .append(Thread.currentThread().getName());
         } catch (Exception ex) {
             getLogger().log(ex);
         }
diff -r e6ba4b4dea45 -r 6a7915fdff8c plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h	Fri Nov 01 11:08:06 2013 +0100
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h	Fri Nov 01 13:23:25 2013 +0100
@@ -78,43 +78,46 @@
   } while (0) 
 
 
-#define PLUGIN_DEBUG(...)                                          \
-  do                                                               \
-  {                                                                \
-	initialize_debug();                                            \
-    if (plugin_debug)  {                                           \
-      if (plugin_debug_to_streams) {                               \
-	    if (plugin_debug_headers) {                                \
-          char s[1000];                                            \
-          time_t t = time(NULL);                                   \
-          struct tm * p = localtime(&t);                           \
-          strftime(s, 1000, "%a %b %d %H:%M:%S %Z %Y", p);         \
-          const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME");  \
-	      fprintf  (stdout, "[%s][ITW-C-PLUGIN][MESSAGE_DEBUG][%s][%s:%d] ITNPP Thread# %ld: ",               \
-            userNameforDebug, s, __FILE__, __LINE__,  pthread_self());                                        \
-	    }                                                          \
-      fprintf (stdout, __VA_ARGS__);                               \
-	  }                                                            \
-    }                                                              \
+//f is after expansion used as FILE*
+#define CREATE_HEADER(f)                               \
+  do                                                   \
+  {                                                    \
+    char s[200];                                       \
+    time_t t = time(NULL);                             \
+    struct tm  p;                                      \
+    localtime_r(&t, &p);                               \
+    strftime(s, 200, "%a %b %d %H:%M:%S %Z %Y", &p);   \
+    const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME");  \
+    fprintf  (f, "[%s][ITW-C-PLUGIN][MESSAGE_DEBUG][%s][%s:%d] ITNPP Thread# %ld, gthread %p: ",        \
+    userNameforDebug, s, __FILE__, __LINE__,  pthread_self(), g_thread_self ());                        \
+  } while (0)
+  
+ 
+#define PLUGIN_DEBUG(...)              \
+  do                                   \
+  {                                    \
+    initialize_debug();                \
+    if (plugin_debug)  {               \
+      if (plugin_debug_to_streams) {   \
+        if (plugin_debug_headers) {    \
+          CREATE_HEADER(stdout);       \
+        }                              \
+      fprintf (stdout, __VA_ARGS__);   \
+      }                                \
+    }                                  \
   } while (0)
 
-// Error reporting macro.
-#define PLUGIN_ERROR(...)                                   \
-  do                                                        \
-  {                                                         \
-	initialize_debug();                                     \
-    if (plugin_debug_to_streams) {                          \
-      if (plugin_debug_headers) {                           \
-        char s[1000];                                       \
-        time_t t = time(NULL);                              \
-        struct tm * p = localtime(&t);                      \
-        strftime(s, 1000, "%A, %B %d %Y", p);               \
-        const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
-        fprintf  (stderr, "[%s][ITW-C-PLUGIN][ERROR_ALL][%s][%s:%d] thread %p: ",                          \
-          userNameforDebug, s, __FILE__, __LINE__, g_thread_self ());                                      \
-		}                                                   \
-		fprintf  (stderr,  __VA_ARGS__);                    \
-	  }                                                     \
+
+#define PLUGIN_ERROR(...)              \
+  do                                   \
+  {                                    \
+    initialize_debug();                \
+    if (plugin_debug_to_streams) {     \
+      if (plugin_debug_headers) {      \
+          CREATE_HEADER(stderr);       \
+        }                              \
+      fprintf  (stderr,  __VA_ARGS__); \
+      }                                \
    } while (0)