Changeset 8663

Timestamp:

05/07/08 17:15:05 (8 months ago)

Author:

vboxsync

Message:

New logger prefix: lockcnts Output: read/write

Files:

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

trunk/include/iprt/log.h

@@ -292 +292 @@
-{
-    /** The logger instance is disabled for normal output. */
-
+    
-    /** The logger instance is using buffered output. */
-
+    
-    /** The logger instance expands LF to CR/LF. */
-
+    
-    /** Show relative timestamps with PREFIX_TSC and PREFIX_TS */
-
+    
-    /** Show decimal timestamps with PREFIX_TSC and PREFIX_TS */
-
-
-
+
+
+
+
+
-    /** New lines should be prefixed with the native process id. */
-
+    
-    /** New lines should be prefixed with group flag number causing the output. */
-
+    
-    /** New lines should be prefixed with group flag name causing the output. */
-
+    
-    /** New lines should be prefixed with group number. */
-
+    
-    /** New lines should be prefixed with group name. */
-
+    
-    /** New lines should be prefixed with the native thread id. */
-
+    
-    /** New lines should be prefixed with thread name. */
-
+    
-    /** New lines should be prefixed with formatted timestamp since program start. */
-
+    
-    /** New lines should be prefixed with formatted timestamp (UCT). */
-
+    
-    /** New lines should be prefixed with milliseconds since program start. */
-
+    
-    /** New lines should be prefixed with timestamp. */
-
+    
-    /** New lines should be prefixed with timestamp. */
-
+    
-    /** The prefix mask. */
-= 0x7cff0
+    = 0x7cff8
-} RTLOGFLAGS;
-

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

@@ -103 +103 @@
-static PRTLOGGER                    g_pRelLogger;
-#endif /* !IN_GC */
+#ifdef IN_RING3
+/** The RTThreadGetWriteLockCount() change caused by the logger mutex semaphore. */
+static uint32_t volatile            g_cLoggerLockCount;
+#endif
-#ifdef IN_RING0
-/** Number of per-thread loggers. */
@@ -413 +417 @@
-
-            /*
-
+
+
-             */
-            if (RT_SUCCESS(rc))
@@ -420 +425 @@
-                if (RT_SUCCESS(rc))
-                {
+#ifdef IN_RING3 /** @todo do counters in ring-0 too? */
+                    RTTHREAD Thread = RTThreadSelf();
+                    if (Thread != NIL_RTTHREAD)
+                    {
+                        int32_t c = RTThreadGetWriteLockCount(Thread);
+                        RTSemFastMutexRequest(pLogger->MutexSem);
+                        c = RTThreadGetWriteLockCount(Thread) - c;
+                        RTSemFastMutexRelease(pLogger->MutexSem);
+                        ASMAtomicWriteU32(&g_cLoggerLockCount, c);
+                    }
+#endif
-                    *ppLogger = pLogger;
-                    return VINF_SUCCESS;
-                }
-
+
+
-                    RTStrPrintf(pszErrorMsg, cchErrorMsg, "failed to create sempahore");
-            }
@@ -1214 +1231 @@
-            { "dec",          sizeof("dec"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          false },
-            { "hex",          sizeof("hex"         ) - 1,   RTLOGFLAGS_DECIMAL_TS,          true  },
+            { "lockcnts",     sizeof("lockcnts"    ) - 1,   RTLOGFLAGS_PREFIX_LOCK_COUNTS,  false },
-            { "cpuid",        sizeof("cpuid"       ) - 1,   RTLOGFLAGS_PREFIX_CPUID,        false },
-            { "pid",          sizeof("pid"         ) - 1,   RTLOGFLAGS_PREFIX_PID,          false },
@@ -1917 +1935 @@
-                /*
-                 * Flush the buffer if there isn't enough room for the maximum prefix config.
-1
+2
-                 */
-1
+2
-                {
-                    rtlogFlush(pLogger);
@@ -2093 +2111 @@
-                    psz += RTStrFormatNumber(psz, idCpu, 16, sizeof(idCpu) * 2, 0, RTSTR_F_ZEROPAD);
-                    *psz++ = ' ';                                                               /* +17 */
+                }
+                if (pLogger->fFlags & RTLOGFLAGS_PREFIX_LOCK_COUNTS)
+                {
+#ifdef IN_RING3 /** @todo implement these counters in ring-0 too? */
+                    RTTHREAD Thread = RTThreadSelf();
+                    if (Thread != NIL_RTTHREAD)
+                    {
+                        uint32_t cReadLocks  = RTThreadGetReadLockCount(Thread);
+                        uint32_t cWriteLocks = RTThreadGetWriteLockCount(Thread) - g_cLoggerLockCount;
+                        cReadLocks  = RT_MIN(0xfff, cReadLocks);
+                        cWriteLocks = RT_MIN(0xfff, cWriteLocks);
+                        psz += RTStrFormatNumber(psz, cReadLocks,  16, 3, 0, RTSTR_F_ZEROPAD);
+                        *psz++ = '/';
+                        psz += RTStrFormatNumber(psz, cWriteLocks, 16, 3, 0, RTSTR_F_ZEROPAD);
+                    }
+                    else
+#endif
+                    {
+                        *psz++ = '0';
+                        *psz++ = '0';
+                        *psz++ = '0';
+                        *psz++ = '/';
+                        *psz++ = '0';
+                        *psz++ = '0';
+                        *psz++ = '0';
+                    }
+                    *psz++ = ' ';                                                               /* +8 */
-                }
-                if (pLogger->fFlags & RTLOGFLAGS_PREFIX_FLAG_NO)