Changeset 3367 in vbox for trunk/src/libs/xpcom18a4/nsprpub/pr

Timestamp:

Jul 3, 2007 12:20:16 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22565

Message:

NSPR: In VBOX builds, NSPR_LOG_FILE may be set to "IPRT" in order to have NSPR logging redirected to the default IPRT logger (the "default" log group).

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io

Files:

• prfile.c (modified) (2 diffs)
• prlog.c (modified) (5 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prfile.c

@@ -72 +72 @@
         return rv;
 
+    PR_LOG(_pr_io_lm, PR_LOG_MAX,
+               ("read: fd=%p osfd=%d buf=%p amount=%d",
+                    fd, fd ? fd->secret->md.osfd : 0, buf, amount));
+
         rv = _PR_MD_READ(fd, buf, amount);
         if (rv < 0) {
@@ -108 +112 @@
 #endif /* XP_UNIX */
     while (amount > 0) {
+        PR_LOG(_pr_io_lm, PR_LOG_MAX,
+                   ("write: fd=%p osfd=%d buf=%p amount=%d",
+                        fd, fd ? fd->secret->md.osfd : 0, buf, amount));
                 temp = _PR_MD_WRITE(fd, buf, amount);
                 if (temp < 0) {

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prlog.c

@@ -54 +54 @@
 #include "prprf.h"
 #include <string.h>
+
+#if defined(VBOX)
+#define IN_RING3
+#include <iprt/runtime.h> // for RTR3Init
+#include <iprt/log.h>
+#endif
 
 /*
@@ -113 +119 @@
 #endif
 
+/*
+** Use the innotek Portable Runtime logging facility when
+** NSPR_LOG_FILE is set to "WinDebug". The default IPRT log instance
+** and the "default" log group will be used for logging.
+*/
+#if defined(VBOX)
+#define IPRT_DEBUG_FILE (FILE*)-3
+#endif
+
 /* Macros used to reduce #ifdef pollution */
 
-#if defined(_PR_USE_STDIO_FOR_LOGGING) && defined(XP_PC)
+#if defined(VBOX)
+#define _PUT_LOG(fd, buf, nb) \
+    PR_BEGIN_MACRO \
+    if (logFile == IPRT_DEBUG_FILE) { \
+        Log(("%*.*S", nb, nb, buf)); \
+    } else { \
+        fwrite(buf, 1, nb, fd); \
+        fflush(fd); \
+    } \
+    PR_END_MACRO
+#elif defined(_PR_USE_STDIO_FOR_LOGGING) && defined(XP_PC)
 #define _PUT_LOG(fd, buf, nb) \
     PR_BEGIN_MACRO \
@@ -289 +314 @@
         && logFile != stdout
         && logFile != stderr
+#ifdef VBOX
+        && logFile != IPRT_DEBUG_FILE
+#endif
 #ifdef XP_PC
         && logFile != WIN32_DEBUG_FILE
@@ -375 +403 @@
     FILE *newLogFile;
 
+#ifdef VBOX
+    if ( strcmp( file, "IPRT") == 0)
+    {
+            // initialize VBox Runtime
+                RTR3Init(false, 0);
+        newLogFile = IPRT_DEBUG_FILE;
+    }
+    else
+#endif
 #ifdef XP_PC
     if ( strcmp( file, "WinDebug") == 0)
@@ -393 +430 @@
         && logFile != stdout
         && logFile != stderr
+#ifdef VBOX
+        && logFile != IPRT_DEBUG_FILE
+#endif
 #ifdef XP_PC
         && logFile != WIN32_DEBUG_FILE