Changeset 2719 for trunk

Timestamp:

Jul 17, 2006, 5:41:44 AM (19 years ago)

Author:

bird

Message:

Portability.

Location:

trunk/libc/src/libc/process

Files:

• Makefile.kmk (modified) (2 diffs)
• fmutex2.c (modified) (2 diffs)
• nt (added)
• os2 (added)
• os2/beinthread-os2.c (moved) (moved from trunk/libc/src/libc/process/beginthr.c )
• os2/fmutex-os2.c (moved) (moved from trunk/libc/src/libc/process/fmutex.c )
• os2/smutex-os2.c (moved) (moved from trunk/libc/src/libc/process/smutex.c )

trunk/libc/src/libc/process/Makefile.kmk

@@ -43 +43 @@
     $(PATH_LIBC_SRC)/libc/process/execvp.c \
     $(PATH_LIBC_SRC)/libc/process/execvpe.c \
+    $(PATH_LIBC_SRC)/libc/process/fmutex2.c \
     $(PATH_LIBC_SRC)/libc/process/fork.c \
     $(PATH_LIBC_SRC)/libc/process/getitimer.c \
@@ -116 +117 @@
 
 libc_libc_process_SOURCES.os2 = \
-    $(PATH_LIBC_SRC)/libc/process/beginthr.c \
-    $(PATH_LIBC_SRC)/libc/process/smutex.c \
-    $(PATH_LIBC_SRC)/libc/process/fmutex.c \
-    $(PATH_LIBC_SRC)/libc/process/fmutex2.c \
+    $(PATH_LIBC_SRC)/libc/process/os2/beginthread-os2.c \
+    $(PATH_LIBC_SRC)/libc/process/os2/smutex-os2.c \
+    $(PATH_LIBC_SRC)/libc/process/os2/fmutex-os2.c \
 
 

trunk/libc/src/libc/process/fmutex2.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#include <os2emx.h>
 #include <stdlib.h>
 #include <string.h>
@@ -59 +58 @@
 void _fmutex_abort(_fmutex *pSem, const char *pszMsg)
 {
-    ULONG ul;
-    static const char szMsg1[] = "\r\n_fmutex operation failed: ";
-    DosWrite(2, szMsg1, sizeof(szMsg1), &ul);
     if (pSem && pSem->pszDesc)
-    {
-        DosWrite(2, pSem->pszDesc, strlen(pSem->pszDesc), &ul);
-        DosWrite(2, " ", 1, &ul);
-    }
-    if (pszMsg)
-        DosWrite(2, pszMsg, strlen(pszMsg), &ul);
-
-    static const char szMsg2[] = "\r\n";
-    DosWrite(2, szMsg2, sizeof(szMsg2), &ul);
-
-    abort();
+        __libc_Back_panic(0, NULL,
+                          "_fmutex operation failed: %p '%s'\n"
+                          "%s",
+                          pSem, pSem->pszDesc, pszMsg);
+    else
+        __libc_Back_panic(0, NULL,
+                          "_fmutex operation failed: %p\n"
+                          "%s",
+                          pSem, pszMsg);
 }