Changeset 2078

Timestamp:

Jun 26, 2005, 5:47:36 AM (20 years ago)

Author:

bird

Message:

More details on failure.

File:

• trunk/src/emx/src/lib/process/fmutex.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/process/fmutex.c

@@ -308 +308 @@
 }
 
+static void __fmutex_deadlock_hex(unsigned u, unsigned cDigits)
+{
+    static const char szHex[17] = "0123456789abcdef";
+    ULONG cb;
+    char sz[32];
+    if (u <= 0xf && cDigits <= 1)
+    {
+        sz[0] = szHex[u & 0xf];
+        sz[1] = '\0';
+        cb = 1;
+    }
+    if (u <= 0xff && cDigits <= 2)
+    {
+        sz[0] = szHex[u >> 4];
+        sz[1] = szHex[u & 0xf];
+        sz[2] = '\0';
+        cb = 2;
+    }
+    else if (u <= 0xffff && cDigits <= 4)
+    {
+        sz[0] = szHex[u >> 12];
+        sz[1] = szHex[(u >> 8) & 0xf];
+        sz[2] = szHex[(u >> 4) & 0xf];
+        sz[3] = szHex[u & 0xf];
+        sz[4] = '\0';
+        cb = 4;
+    }
+    else
+    {
+        sz[0] = szHex[u >> 28];
+        sz[1] = szHex[(u >> 24) & 0xf];
+        sz[2] = szHex[(u >> 20) & 0xf];
+        sz[3] = szHex[(u >> 16) & 0xf];
+        sz[4] = szHex[(u >> 12) & 0xf];
+        sz[5] = szHex[(u >>  8) & 0xf];
+        sz[6] = szHex[(u >>  4) & 0xf];
+        sz[7] = szHex[u & 0xf];
+        sz[8] = '\0';
+        cb = 8;
+    }
+    DosWrite(2, sz, cb, &cb);
+}
 
 static void __fmutex_deadlock(_fmutex *pSem, const char *pszMsg)
 {
     ULONG ul;
-    static const char szMsg[] = "\r\n!!!deadlock!!! ";
-    DosWrite(2, szMsg, sizeof(szMsg), &ul);
+    static const char szMsg[] = "\r\n!!!deadlock!!! fmutex ";
+    DosWrite(2, szMsg, sizeof(szMsg) - 1, &ul);
     if (pSem->pszDesc)
-    {
         DosWrite(2, pSem->pszDesc, strlen(pSem->pszDesc), &ul);
-        DosWrite(2, " ", 1, &ul);
-    }
     if (pszMsg)
+    {
+        DosWrite(2, ": ", 2, &ul);
         DosWrite(2, pszMsg, strlen(pszMsg), &ul);
-    static const char szNewLine[] = "\r\n";
-    DosWrite(2, szNewLine, sizeof(szNewLine), &ul);
+    }
+    static const char szMsg2[] = "\r\nOwner=0x";
+    DosWrite(2, szMsg2, sizeof(szMsg2) - 1, &ul);
+    __fmutex_deadlock_hex(pSem->Owner, 8);
+    static const char szMsg3[] = " Self=0x";
+    DosWrite(2, szMsg3, sizeof(szMsg3) - 1, &ul);
+    __fmutex_deadlock_hex(fibGetTidPid(), 8);
+    static const char szMsg4[] = " fs=0x";
+    DosWrite(2, szMsg4, sizeof(szMsg4) - 1, &ul);
+    __fmutex_deadlock_hex(pSem->fs, 2);
+    static const char szMsg5[] = "\r\n";
+    DosWrite(2, szMsg5, sizeof(szMsg5) - 1, &ul);
+
     __asm__ __volatile__("movl $0xdead10cc, %%eax; movl $0xdead10cc, %%edx; movl %0, %%ecx; int $3" : : "m" (pSem) : "%eax", "%edx", "%ecx");
 }