Changeset 28695 in vbox

Timestamp:

Apr 24, 2010 9:35:20 PM (15 years ago)

Author:

vboxsync

Message:

iprt/log: Added a write-through flag and a flush flag for file destination. Use RTFILE_O_APPEND (cleanup).

Location:

trunk

Files:

• include/iprt/log.h (modified) (1 diff)
• src/VBox/Runtime/common/log/log.cpp (modified) (3 diffs)

trunk/include/iprt/log.h

@@ -324 +324 @@
     /** Show decimal timestamps with PREFIX_TSC and PREFIX_TS */
     RTLOGFLAGS_DECIMAL_TS           = 0x00000080,
-    /** Log flushing disabled. */
-    RTLOGFLAGS_NO_FLUSH             = 0x00000100,
+    /** Open the file in write through mode. */
+    RTLOGFLAGS_WRITE_THROUGH        = 0x00000100,
+    /** Flush the file to disk when flushing the buffer. */
+    RTLOGFLAGS_FLUSH                = 0x00000200,
     /** New lines should be prefixed with the write and read lock counts. */
     RTLOGFLAGS_PREFIX_LOCK_COUNTS   = 0x00008000,

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -159 +159 @@
     { "dec",          sizeof("dec"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          false },
     { "hex",          sizeof("hex"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          true  },
+    { "writethru",    sizeof("writethru"   ) - 1,   RTLOGFLAGS_WRITE_THROUGH,       true  },
+    { "writethrough", sizeof("writethrough") - 1,   RTLOGFLAGS_WRITE_THROUGH,       true  },
+    { "flush",        sizeof("flush"       ) - 1,   RTLOGFLAGS_FLUSH,               true  },
     { "lockcnts",     sizeof("lockcnts"    ) - 1,   RTLOGFLAGS_PREFIX_LOCK_COUNTS,  false },
     { "cpuid",        sizeof("cpuid"       ) - 1,   RTLOGFLAGS_PREFIX_CPUID,        false },
@@ -382 +385 @@
             if (pLogger->fDestFlags & RTLOGDEST_FILE)
             {
-                if (!(pLogger->fFlags & RTLOGFLAGS_APPEND))
-                    rc = RTFileOpen(&pLogger->File, pLogger->pszFilename,
-                                    RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE);
+                uint32_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_WRITE;
+                if (pLogger->fFlags & RTLOGFLAGS_APPEND)
+                    fOpen |= RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND;
                 else
-                {
-                    /** @todo RTFILE_O_APPEND. */
-                    rc = RTFileOpen(&pLogger->File, pLogger->pszFilename,
-                                    RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
-                    if (RT_SUCCESS(rc))
-                    {
-                        rc = RTFileSeek(pLogger->File, 0, RTFILE_SEEK_END, NULL);
-                        if (RT_FAILURE(rc))
-                        {
-                            RTFileClose(pLogger->File);
-                            pLogger->File = NIL_RTFILE;
-                        }
-                    }
-                }
+                    fOpen |= RTFILE_O_CREATE_REPLACE;
+                if (pLogger->fFlags & RTLOGFLAGS_WRITE_THROUGH)
+                    fOpen |= RTFILE_O_WRITE_THROUGH;
+                rc = RTFileOpen(&pLogger->File, pLogger->pszFilename, fOpen);
                 if (RT_FAILURE(rc) && pszErrorMsg)
-                    RTStrPrintf(pszErrorMsg, cchErrorMsg, "could not open file '%s'", pLogger->pszFilename);
+                    RTStrPrintf(pszErrorMsg, cchErrorMsg, "could not open file '%s' (fOpen=%#x)", pLogger->pszFilename, fOpen);
             }
 #endif  /* IN_RING3 */
@@ -2208 +2201 @@
 # ifdef IN_RING3
     if (pLogger->fDestFlags & RTLOGDEST_FILE)
+    {
         RTFileWrite(pLogger->File, pLogger->achScratch, pLogger->offScratch, NULL);
+        if (pLogger->fFlags & RTLOGFLAGS_FLUSH)
+            RTFileFlush(pLogger->File);
+    }
 # endif