Changeset 3371

Timestamp:

May 27, 2007, 8:37:38 AM (18 years ago)

Author:

bird

Message:

perhaps we should exit all MCs before comitting suicide?

Files:

• branches/libc-0.6/src/emx/src/lib/sys/logstrict.c (modified) (4 diffs)
• trunk/libc/src/kNIX/os2/logstrict.c (modified) (4 diffs)

branches/libc-0.6/src/emx/src/lib/sys/logstrict.c

@@ -611 +611 @@
 static void __libc_logWrite(__LIBC_PLOGINST pInst, unsigned fGroupAndFlags, const char *pszMsg, size_t cch, int fStdErr)
 {
-    APIRET  rc;
+    APIRET  rcSem;
+    APIRET  rcMC;
+    ULONG   ulIgnore = 0;
     ULONG   cb = 0;
     HMTX    hmtx = pInst->hmtx;
@@ -619 +621 @@
     /*
      * Aquire mutex ownership.
-     */
-    rc = DosRequestMutexSem(hmtx, SEM_INDEFINITE_WAIT);
-    switch (rc)
-    {
-        case 0:
+     * We enter a must-complete section here to avoid getting interrupted
+     * while writing and creating deadlocks.
+     */
+    rcMC = DosEnterMustComplete(&ulIgnore);
+    rcSem = DosRequestMutexSem(hmtx, 5000);
+    switch (rcSem)
+    {
+        case NO_ERROR:
             break;
+
         /* recreate the semaphore for some odd. */
         case ERROR_INVALID_HANDLE:
@@ -630 +636 @@
         {
             HMTX    hmtxNew;
-            rc = DosCreateMutexSem(NULL, &hmtxNew, 0, TRUE);
-            if (!rc)
+            rcSem = DosCreateMutexSem(NULL, &hmtxNew, 0, TRUE);
+            if (!rcSem)
             {
                 hmtx = __lxchg((int*)&pInst->hmtx, hmtxNew);
@@ -647 +653 @@
     if (fGroupAndFlags & __LIBC_LOG_MSGF_FLUSH)
         DosResetBuffer(pInst->hFile);
-    if (!rc)
+    if (!rcSem)
         DosReleaseMutexSem(pInst->hmtx);
+    if (!rcMC)
+        DosExitMustComplete(&ulIgnore);
     FS_RESTORE();
 

trunk/libc/src/kNIX/os2/logstrict.c

@@ -592 +592 @@
 static void __libc_logWrite(__LIBC_PLOGINST pInst, unsigned fGroupAndFlags, const char *pszMsg, size_t cch, int fStdErr)
 {
-    APIRET  rc;
+    APIRET  rcSem;
+    APIRET  rcMC;
+    ULONG   ulIgnore = 0;
     ULONG   cb = 0;
     HMTX    hmtx = pInst->hmtx;
@@ -600 +602 @@
     /*
      * Aquire mutex ownership.
-     */
-    rc = DosRequestMutexSem(hmtx, SEM_INDEFINITE_WAIT);
-    switch (rc)
-    {
-        case 0:
+     * We enter a must-complete section here to avoid getting interrupted
+     * while writing and creating deadlocks.
+     */
+    rcMC = DosEnterMustComplete(&ulIgnore);
+    rcSem = DosRequestMutexSem(hmtx, 5000);
+    switch (rcSem)
+    {
+        case NO_ERROR:
             break;
+
         /* recreate the semaphore for some odd. */
         case ERROR_INVALID_HANDLE:
@@ -611 +617 @@
         {
             HMTX    hmtxNew;
-            rc = DosCreateMutexSem(NULL, &hmtxNew, 0, TRUE);
-            if (!rc)
+            rcSem = DosCreateMutexSem(NULL, &hmtxNew, 0, TRUE);
+            if (!rcSem)
             {
                 hmtx = __lxchg((int*)&pInst->hmtx, hmtxNew);
@@ -628 +634 @@
     if (fGroupAndFlags & __LIBC_LOG_MSGF_FLUSH)
         DosResetBuffer(pInst->hFile);
-    if (!rc)
+    if (!rcSem)
         DosReleaseMutexSem(pInst->hmtx);
+    if (!rcMC)
+        DosExitMustComplete(&ulIgnore);
     FS_RESTORE();