Changeset 3849 for branches/libc-0.6/src

Timestamp:

Mar 16, 2014, 10:17:54 PM (11 years ago)

Author:

bird

Message:

fmutex: Don't panic on process exit (exit lists etc), also don't wait too long on mutexes during process exit since the owner might be dead. Fixes #256.

File:

• branches/libc-0.6/src/emx/src/lib/process/fmutex.c (modified) (8 diffs)

branches/libc-0.6/src/emx/src/lib/process/fmutex.c

@@ -148 +148 @@
         for (;;)
         {
-            rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
+            ULONG cMsWait = sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000;
+            if (fibIsInExit())
+                cMsWait = 250;
+            rc = DosWaitEventSem(sem->hev, cMsWait);
             if (rc == ERROR_INTERRUPT)
             {
@@ -165 +168 @@
             if (rc != ERROR_TIMEOUT)
                 break;
+
             /*
              * Deadlock detection - check if owner is around.
@@ -179 +183 @@
             }
         }
+
         FS_RESTORE();
         if (rc != 0)
@@ -284 +289 @@
         for (;;)
         {
-            DosExitMustComplete(&ulNesting);
-            rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
+            ULONG cMsWait = sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000;
+            if (fibIsInExit())
+                cMsWait = 250;
+            DosExitMustComplete(&ulNesting);
+            rc = DosWaitEventSem(sem->hev, cMsWait);
             DosEnterMustComplete(&ulNesting);
             if (rc == ERROR_INTERRUPT)
@@ -303 +311 @@
             if (rc != ERROR_TIMEOUT)
                 break;
+
             /*
              * Deadlock detection - check if owner is around.
@@ -319 +328 @@
             }
         }
+
         FS_RESTORE();
         if (rc != 0)
@@ -331 +341 @@
 static void __fmutex_deadlock(_fmutex *pSem, const char *pszMsg)
 {
-    __libc_Back_panic(0, NULL,
-                      "fmutex deadlock: %s\n"
-                      "%x: Owner=%x Self=%x fs=%x flags=%x hev=%x\n"
-                      "            Desc=\"%s\"\n",
-                      pszMsg,
-                      pSem, pSem->Owner, fibGetTidPid(), pSem->fs, pSem->flags, pSem->hev,
-                      pSem->pszDesc);
+    if (!fibIsInExit())
+        __libc_Back_panic(0, NULL,
+                          "fmutex deadlock: %s\n"
+                          "%x: Owner=%x Self=%x fs=%x flags=%x hev=%x\n"
+                          "            Desc=\"%s\"\n",
+                          pszMsg,
+                          pSem, pSem->Owner, fibGetTidPid(), pSem->fs, pSem->flags, pSem->hev,
+                          pSem->pszDesc);
 }
 
@@ -377 +388 @@
     {
         FS_RESTORE();
-        LIBCLOG_RETURN_UINT(rc);
+        LIBCLOG_ERROR_RETURN_UINT(rc);
     }