Changeset 628 in vbox

Timestamp:

Feb 5, 2007 11:59:58 AM (18 years ago)

Author:

vboxsync

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

18257

Message:

Implement log flag usecrlf, which translates LF line ending to CR/LF.
Activate it by default for Windows builds, only for release log so far.
Also fixed a couple of typos in comments.

Location:

trunk

Files:

• include/VBox/pdm.h (modified) (1 diff)
• include/iprt/log.h (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Runtime/log.cpp (modified) (3 diffs)
• src/VBox/Runtime/logformat.cpp (modified) (1 diff)
• src/VBox/Runtime/strformat.cpp (modified) (2 diffs)

trunk/include/VBox/pdm.h

@@ -6417 +6417 @@
 /**
  * This function will notify all the devices and their
- * attached drivers about the VM now being reset.
+ * attached drivers about the VM now being suspended.
  *
  * @param   pVM     VM Handle.

trunk/include/iprt/log.h

@@ -279 +279 @@
     /** The logger instance is using buffered output. */
     RTLOGFLAGS_BUFFERED         = 0x00000002,
+    /** The logger instance expands LF to CR/LF. */
+    RTLOGFLAGS_USECRLF          = 0x00000010,
     /** Show relative timestamps with PREFIX_TSC and PREFIX_TS */
     RTLOGFLAGS_REL_TS           = 0x00010000,
@@ -1281 +1283 @@
  * @param   pfnOutput   Output worker.
  *                      Called in two ways. Normally with a string an it's length.
- *                      For termiation, it's called with NULL for string, 0 for length.
+ *                      For termination, it's called with NULL for string, 0 for length.
  * @param   pvArg       Argument to output worker.
  * @param   pszFormat   Format string.

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6188 +6188 @@
         PRTLOGGER loggerRelease;
         static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-        vrc = RTLogCreate(&loggerRelease, RTLOGFLAGS_PREFIX_TIME_PROG, "all",
+        RTUINT fFlags = RTLOGFLAGS_PREFIX_TIME_PROG;
+#ifdef __WIN__
+        fFlags |= RTLOGFLAGS_USECRLF;
+#endif /* __WIN__ */
+        vrc = RTLogCreate(&loggerRelease, fFlags, "all",
                           "VBOX_RELEASE_LOG", ELEMENTS(s_apszGroups), s_apszGroups,
                           RTLOGDEST_FILE, logFile.raw());

trunk/src/VBox/Runtime/log.cpp

@@ -1109 +1109 @@
             { "buffered",     sizeof("buffered"    ) - 1,   RTLOGFLAGS_BUFFERED,            false },
             { "unbuffered",   sizeof("unbuffered"  ) - 1,   RTLOGFLAGS_BUFFERED,            true  },
+            { "usecrlf",      sizeof("usecrlf"     ) - 1,   RTLOGFLAGS_USECRLF,             true },
+            { "uself",        sizeof("uself"       ) - 1,   RTLOGFLAGS_USECRLF,             false  },
             { "rel",          sizeof("rel"         ) - 1,   RTLOGFLAGS_REL_TS,              false },
-            { "abs",          sizeof("rel"         ) - 1,   RTLOGFLAGS_REL_TS,              true  },
+            { "abs",          sizeof("abs"         ) - 1,   RTLOGFLAGS_REL_TS,              true  },
             { "dec",          sizeof("dec"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          false },
             { "hex",          sizeof("hex"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          true  },
@@ -2053 +2055 @@
             if (pszNewLine)
             {
-                pLogger->fPendingPrefix = true;
-                cb = pszNewLine - pachChars + 1;
+                if (pLogger->fFlags & RTLOGFLAGS_USECRLF)
+                    cb = pszNewLine - pachChars;
+                else
+                {
+                    cb = pszNewLine - pachChars + 1;
+                    pLogger->fPendingPrefix = true;
+                }
             }
 
@@ -2064 +2071 @@
             cbRet += cb;
             cbChars -= cb;
+
+            if (    pszNewLine
+                &&  pLogger->fFlags & RTLOGFLAGS_USECRLF
+                &&  pLogger->offScratch + 2 < sizeof(pLogger->achScratch))
+            {
+                memcpy(&pLogger->achScratch[pLogger->offScratch], "\r\n", 2);
+                pLogger->offScratch += 2;
+                cbRet++;
+                cbChars--;
+                cb++;
+                pLogger->fPendingPrefix = true;
+            }
 
             /* done? */

trunk/src/VBox/Runtime/logformat.cpp

@@ -51 +51 @@
  * @param   pfnOutput   Output worker.
  *                      Called in two ways. Normally with a string an it's length.
- *                      For termiation, it's called with NULL for string, 0 for length.
+ *                      For termination, it's called with NULL for string, 0 for length.
  * @param   pvArg       Argument to output worker.
  * @param   pszFormat   Format string.

trunk/src/VBox/Runtime/strformat.cpp

@@ -291 +291 @@
  * @param   pfnOutput   Output worker.
  *                      Called in two ways. Normally with a string an it's length.
- *                      For termiation, it's called with NULL for string, 0 for length.
+ *                      For termination, it's called with NULL for string, 0 for length.
  * @param   pvArgOutput Argument to the output worker.
  * @param   pfnFormat   Custom format worker.
@@ -818 +818 @@
  * @param   pfnOutput   Output worker.
  *                      Called in two ways. Normally with a string an it's length.
- *                      For termiation, it's called with NULL for string, 0 for length.
+ *                      For termination, it's called with NULL for string, 0 for length.
  * @param   pvArgOutput Argument to the output worker.
  * @param   pfnFormat   Custom format worker.