Changeset 8663 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 7, 2008 3:15:05 PM (17 years ago)

Author:

vboxsync

Message:

New logger prefix: lockcnts Output: read/write

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (6 diffs)

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 @@
 
             /*
-             * Create mutex.
+             * Create mutex and check how much it counts when entering the lock
+             * so that we can report the values for RTLOGFLAGS_PREFIX_LOCK_COUNTS.
              */
             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;
                 }
-                else if (pszErrorMsg)
+
+                if (pszErrorMsg)
                     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.
-                 * Max is 214, add a couple of extra bytes.
+                 * Max is 224, add a couple of extra bytes.
                  */
-                if (cb < 214 + 16)
+                if (cb < 224 + 16)
                 {
                     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)