Changeset 2723

Timestamp:

Jul 17, 2006, 7:10:19 AM (19 years ago)

Author:

bird

Message:

Started porting to NT.

Location:

trunk/libc

Files:

• Config.kmk (modified) (4 diffs)
• include/386/builtin.h (modified) (1 diff)
• include/klibc (added)
• include/klibc/nt (added)
• include/klibc/nt/nt.h (added)
• include/sys/fmutex.h (modified) (1 diff)
• src/libc/process/Makefile.kmk (modified) (1 diff)
• src/libc/process/nt/fmutex-nt.c (copied) (copied from trunk/libc/src/libc/process/os2/fmutex-os2.c ) (11 diffs)
• src/libc/process/nt/smutex-nt.c (copied) (copied from trunk/libc/src/libc/process/os2/smutex-os2.c ) (2 diffs)
• src/libc/process/os2/fmutex-os2.c (modified) (1 diff)

trunk/libc/Config.kmk

@@ -50 +50 @@
         IN_INNOTEK_LIBC \
         __IN_INNOTEK_LIBC__
+DEFS.os2   = __OS2__
+DEFS.win32 = __NT__
+DEFS.win64 = __NT__
+
 
 #
@@ -73 +77 @@
 TEMPLATE_libc_TOOL = GCC3
 TEMPLATE_libc_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
+TEMPLATE_libc_INCS.win32 = $(PATH_LIBC_SRC)/w32api/include
+TEMPLATE_libc_INCS.win64 = $(TEMPLATE_libc_INCS.win32)
 TEMPLATE_libc_DEPS = $(LIBC-STD.H)
 TEMPLATE_libc_INST = usr/lib/
@@ -80 +86 @@
 TEMPLATE_libc.logstrict_TOOL = GCC3
 TEMPLATE_libc.logstrict_INCS = $(TEMPLATE_libc_INCS)
+TEMPLATE_libc.logstrict_INCS.win32 = $(TEMPLATE_libc_INCS.win32)
+TEMPLATE_libc.logstrict_INCS.win64 = $(TEMPLATE_libc_INCS.win64)
 TEMPLATE_libc.logstrict_DEFS = $(TEMPLATE_libc_DEFS) __LIBC_STRICT DEBUG_LOGGING
 TEMPLATE_libc.logstrict_DEPS = $(TEMPLATE_libc_DEPS)
@@ -88 +96 @@
 TEMPLATE_libc.profiled_TOOL = GCC3
 TEMPLATE_libc.profiled_INCS = $(TEMPLATE_libc_INCS)
+TEMPLATE_libc.profiled_INCS.win32 = $(TEMPLATE_libc_INCS.win32)
+TEMPLATE_libc.profiled_INCS.win64 = $(TEMPLATE_libc_INCS.win64)
 TEMPLATE_libc.profiled_DEFS = $(TEMPLATE_libc_DEFS) __LIBC_PROFILED
 TEMPLATE_libc.profiled_DEPS = $(TEMPLATE_libc_DEPS)

trunk/libc/include/386/builtin.h

@@ -428 +428 @@
 
 
+/**
+ * Atomically compare and exchange a pointer.
+ *
+ * @returns 1 if changed, 0 if unchanged (i.e. boolean).
+ * @param   ppv     Pointer to the value to compare & exchange.
+ * @param   pvNew   The new value.
+ * @param   pvCur   The current value. Only update if *pu32 equals this one.
+ */
+static inline unsigned __atomic_cmpxchgptr(void * volatile *ppv, void *pvNew,  void *pvOld)
+{
+    __asm__ __volatile__("lock; cmpxchgl %2, %1\n\t"
+                         "setz  %%al\n\t"
+                         "movzx %%al, %%eax\n\t"
+                         : "=a" (pvOld),
+                           "=m" (*ppv)
+                         : "r"  (pvNew),
+                           "0" (pvOld));
+    return (uintptr_t)pvOld;
+}
+
 #define __ROTATE_FUN(F,I,T) \
   static __inline__ T F (T value, int shift) \

trunk/libc/include/sys/fmutex.h

@@ -41 +41 @@
 {
     /** Handle to event semaphore. */
+#ifdef __OS2__
     unsigned long           hev;
+#else
+    void                   *hev;
+#endif
     /** Semaphore status. */
     volatile signed char    fs;

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

@@ -121 +121 @@
     $(PATH_LIBC_SRC)/libc/process/os2/fmutex-os2.c \
 
+libc_libc_process_SOURCES.win32 = \
+    $(PATH_LIBC_SRC)/libc/process/nt/fmutex-nt.c \
+    $(PATH_LIBC_SRC)/libc/process/nt/smutex-nt.c \
+
+libc_libc_process_SOURCES.win64 = $(libc_libc_process_SOURCES.win32)
 
 # configure the variants. */

trunk/libc/src/libc/process/nt/fmutex-nt.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSPROCESS
-#define INCL_DOSERRORS
-#define INCL_DOSEXCEPTIONS
-#define INCL_FSMACROS
-#define INCL_EXAPIS
-#include <os2.h>
+#include <klibc/nt/nt.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14 +8 @@
 #include <sys/fmutex.h>
 #include <sys/smutex.h>
-#include <InnoTekLIBC/FastInfoBlocks.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MUTEX
 #include <InnoTekLIBC/logstrict.h>
@@ -28 +21 @@
 
 
-unsigned _fmutex_create(_fmutex *sem, unsigned flags)
-{
-    LIBCLOG_ENTER("sem=%p flags=%#x\n", (void *)sem, flags);
-    unsigned rc = _fmutex_create2(sem, flags, NULL);
+unsigned _fmutex_create(_fmutex *pSem, unsigned flags)
+{
+    LIBCLOG_ENTER("pSem=%p flags=%#x\n", (void *)pSem, flags);
+    unsigned rc = _fmutex_create2(pSem, flags, NULL);
     if (!rc)
         LIBCLOG_RETURN_UINT(rc);
@@ -38 +31 @@
 
 
-unsigned _fmutex_create2(_fmutex *sem, unsigned flags, const char *pszDesc)
-{
-    LIBCLOG_ENTER("sem=%p flags=%#x pszDesc=%s\n", (void *)sem, flags, pszDesc);
-    unsigned rc;
-
-    sem->hev        = 0;
-    sem->Owner      = 0;
-    sem->fs         = _FMS_AVAILABLE;
-    sem->flags      = flags;
-    sem->padding[0] = 'f';
-    sem->padding[1] = 'm';
-    sem->pszDesc    = pszDesc;
-    rc = DosCreateEventSemEx(NULL, (PHEV)&sem->hev,
-                             (flags & _FMC_SHARED) ? DC_SEM_SHARED : 0,
-                             FALSE);
-    if (!rc)
+unsigned _fmutex_create2(_fmutex *pSem, unsigned flags, const char *pszDesc)
+{
+    LIBCLOG_ENTER("pSem=%p flags=%#x pszDesc=%s\n", (void *)pSem, flags, pszDesc);
+    if (flags & _FMC_SHARED)
+        __libc_Back_panic(0, NULL, "_fmutex_create2: _FMC_SHARED isn't supported on NT. sorry.\n");
+
+    pSem->hev        = 0;
+    pSem->Owner      = 0;
+    pSem->fs         = _FMS_AVAILABLE;
+    pSem->flags      = flags;
+    pSem->padding[0] = 'f';
+    pSem->padding[1] = 'm';
+    pSem->pszDesc    = pszDesc;
+    NTSTATUS rc = NtCreateEvent(&pSem->hev, EVENT_ALL_ACCESS, NULL, FALSE, FALSE);
+    if (NT_SUCCESS(rc))
         LIBCLOG_RETURN_UINT(rc);
     LIBCLOG_ERROR_RETURN_UINT(rc);
@@ -59 +51 @@
 
 
-unsigned _fmutex_open(_fmutex *sem)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
-    unsigned rc = DosOpenEventSemEx(NULL, (PHEV)&sem->hev);
-    if (!rc)
+unsigned _fmutex_open(_fmutex *pSem)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s}\n", (void *)pSem, pSem->pszDesc);
+    __libc_Back_panic(0, NULL, "_fmutex_open: _FMC_SHARED isn't supported on NT. sorry.\n");
+}
+
+
+unsigned _fmutex_close(_fmutex *pSem)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s}\n", (void *)pSem, pSem->pszDesc);
+    NTSTATUS rc = NtClose(pSem->hev);
+    if (NT_SUCCESS(rc))
         LIBCLOG_RETURN_UINT(rc);
     LIBCLOG_ERROR_RETURN_UINT(rc);
@@ -69 +68 @@
 
 
-unsigned _fmutex_close(_fmutex *sem)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
-    unsigned rc = DosCloseEventSemEx(sem->hev);
-    if (!rc)
-        LIBCLOG_RETURN_UINT(rc);
-    LIBCLOG_ERROR_RETURN_UINT(rc);
-}
-
-
-unsigned __fmutex_request_internal(_fmutex *sem, unsigned flags, signed char fs)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s} flags=%#x fs=%#x\n", (void *)sem, sem->pszDesc, flags, (int)fs);
+unsigned __fmutex_request_internal(_fmutex *pSem, unsigned flags, signed char fs)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s} flags=%#x fs=%#x\n", (void *)pSem, pSem->pszDesc, flags, (int)fs);
     int     rc;
 
@@ -90 +79 @@
     }
 
-    if (fs == _FMS_AUTO_INITIALIZE || !sem->hev)
-    {
-        HEV hev;
-        rc = DosCreateEventSemEx(NULL, &hev, sem->flags & _FMC_SHARED ? DC_SEM_SHARED : 0, FALSE);
-        if (rc)
-        {
-            LIBC_ASSERTM_FAILED("Failed to create event semaphore for fmutex '%s', rc=%d. flags=%#x\n", sem->pszDesc, rc, sem->flags);
-            LIBCLOG_RETURN_UINT(ERROR_INVALID_HANDLE);
-        }
-        if (__atomic_cmpxchg32((volatile uint32_t *)&sem->hev, hev, 0))
-        {
-            LIBCLOG_MSG("auto initialized fmutex %p '%s'\n", (void *)sem, sem->pszDesc);
-            __atomic_xchg(&sem->Owner, fibGetTidPid());
+    if (fs == _FMS_AUTO_INITIALIZE || !pSem->hev)
+    {
+        if (pSem->flags & _FMC_SHARED)
+            __libc_Back_panic(0, NULL, "_fmutex_request_internal: _FMC_SHARED isn't supported on NT. sorry.\n");
+
+        HANDLE hev;
+        NTSTATUS rc = NtCreateEvent(&hev, EVENT_ALL_ACCESS, NULL, FALSE, FALSE);
+        if (!NT_SUCCESS(rc))
+        {
+            LIBC_ASSERTM_FAILED("Failed to create event semaphore for fmutex '%s', rc=%d. flags=%#x\n", pSem->pszDesc, rc, pSem->flags);
+            LIBCLOG_RETURN_UINT(rc);
+        }
+        if (__atomic_cmpxchgptr(&pSem->hev, hev, 0))
+        {
+            LIBCLOG_MSG("auto initialized fmutex %p '%s'\n", (void *)pSem, pSem->pszDesc);
+            __atomic_xchg(&pSem->Owner, fibGetTidPid());
             LIBCLOG_RETURN_UINT(NO_ERROR);
         }
-        LIBCLOG_MSG("lost auto initialization race for fmutex %p '%s'\n", (void *)sem, sem->pszDesc);
-        DosCloseEventSemEx(hev);
+        LIBCLOG_MSG("lost auto initialization race for fmutex %p '%s'\n", (void *)pSem, pSem->pszDesc);
+        NtClose(hev);
         fs = _FMS_OWNED_HARD;
     }
@@ -114 +106 @@
         if (fs == _FMS_OWNED_HARD)
         {
-            if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+            if (__cxchg(&pSem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
             {
-                __atomic_xchg(&sem->Owner, fibGetTidPid());
+                __atomic_xchg(&pSem->Owner, fibGetTidPid());
                 LIBCLOG_RETURN_UINT(0);
             }
         }
-        LIBCLOG_RETURN_UINT(ERROR_MUTEX_OWNED);
+        LIBCLOG_RETURN_UINT(STATUS_TIMEOUT);
     }
 
@@ -126 +118 @@
     {
         ULONG ulCount;
-        FS_VAR();
-        FS_SAVE_LOAD();
-        rc = DosResetEventSem(sem->hev, &ulCount);
-        FS_RESTORE();
-        if (rc != 0 && rc != ERROR_ALREADY_RESET)
-            LIBCLOG_RETURN_UINT(rc);
-        if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
-        {
-            __atomic_xchg(&sem->Owner, fibGetTidPid());
+        if (__cxchg(&pSem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&pSem->Owner, fibGetTidPid());
             LIBCLOG_RETURN_UINT(0);
         }
-        if (sem->Owner == fibGetTidPid())
-        {
-            __fmutex_deadlock(sem, "Recursive mutex!");
+        if (pSem->Owner == fibGetTidPid())
+        {
+            __fmutex_deadlock(pSem, "Recursive mutex!");
             LIBCLOG_RETURN_UINT(-1);
         }
 
-        FS_SAVE_LOAD();
-
         for (;;)
         {
-            rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
-            if (rc == ERROR_INTERRUPT)
+            LARGE_INTEGER Interval;
+            Interval.QuadPart = -30000000; /* 3sec */
+            rc = NtWaitForSingleObject(pSem->hev, TRUE, &Interval);
+            if (rc == STATUS_WAIT_0)
+                break;
+            if (    rc == STATUS_ALERTED
+                ||  rc == STATUS_TIMEOUT)
             {
-                /*
-                 * An interrupt occured, this might be a bug in the wait, or
-                 * more likely someone is killing us. If we're dying/exiting or
-                 * something along those lines, we return to the caller no matter
-                 * what flags it specified.
-                 */
-                if (!(flags & _FMR_IGNINT))
-                    break;
-                if (fibIsInExit())
-                    break;
-                rc = ERROR_TIMEOUT;
+                /** @todo check for process termination and validate owner. */
             }
-            if (rc != ERROR_TIMEOUT)
+            else if (NT_SUCCESS(rc))
                 break;
-            /*
-             * Deadlock detection - check if owner is around.
-             */
-            unsigned Owner = sem->Owner;
-            if (!Owner)
-                break;
-            rc = DosVerifyPidTid(Owner >> 16, Owner & 0xffff);
-            if (rc)
-            {
-                __fmutex_deadlock(sem, "Owner died!");
-                rc = ERROR_SEM_OWNER_DIED;
-                break;
-            }
-        }
-        FS_RESTORE();
-        if (rc != 0)
-            LIBCLOG_RETURN_UINT(rc);
-    }
-}
-
-unsigned __fmutex_request_internal_must_complete(_fmutex *sem, unsigned flags)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s} flags=%#x\n", (void *)sem, sem->pszDesc, flags);
-    int     rc;
-    ULONG   ulNesting = 0;
-    signed char fs;
-    FS_VAR();
-
-    if (sem->fs == _FMS_UNINIT)
-    {
-        LIBC_ASSERTM_FAILED("Invalid handle, fs == _FMS_UNINIT\n");
-        LIBCLOG_RETURN_UINT(ERROR_INVALID_HANDLE);
-    }
-
-    FS_SAVE_LOAD();
-    DosEnterMustComplete(&ulNesting);
-    fs = __cxchg(&sem->fs, _FMS_OWNED_SIMPLE);
+            else
+                LIBCLOG_ERROR_RETURN_UINT(rc);
+        }
+    }
+}
+
+unsigned __fmutex_request_internal_must_complete(_fmutex *pSem, unsigned flags)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s} flags=%#x\n", (void *)pSem, pSem->pszDesc, flags);
+    /** @todo figure out how to do must_complete stuff on NT. */
+    unsigned rc;
+    signed char fs = __cxchg(&pSem->fs, _FMS_OWNED_SIMPLE);
     if (fs == _FMS_AVAILABLE)
     {
-        __atomic_xchg(&sem->Owner, fibGetTidPid());
-        FS_RESTORE();
-        LIBCLOG_RETURN_UINT(0);
-    }
-
-    if (fs == _FMS_AUTO_INITIALIZE || !sem->hev)
-    {
-        HEV hev;
-        rc = DosCreateEventSemEx(NULL, &hev, sem->flags & _FMC_SHARED ? DC_SEM_SHARED : 0, FALSE);
-        if (rc)
-        {
-            LIBC_ASSERTM_FAILED("Failed to create event semaphore for fmutex '%s', rc=%d. flags=%#x\n", sem->pszDesc, rc, sem->flags);
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(ERROR_INVALID_HANDLE);
-        }
-        if (__atomic_cmpxchg32((volatile uint32_t *)&sem->hev, hev, 0))
-        {
-            LIBCLOG_MSG("auto initialized fmutex %p '%s'\n", (void *)sem, sem->pszDesc);
-            __atomic_xchg(&sem->Owner, fibGetTidPid());
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(NO_ERROR);
-        }
-        LIBCLOG_MSG("lost auto initialization race for fmutex %p '%s'\n", (void *)sem, sem->pszDesc);
-        DosCloseEventSemEx(hev);
-        fs = _FMS_OWNED_HARD;
-    }
-
-    if (flags & _FMR_NOWAIT)
-    {
-        if (fs == _FMS_OWNED_HARD)
-        {
-            if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
-            {
-                __atomic_xchg(&sem->Owner, fibGetTidPid());
-                FS_RESTORE();
-                LIBCLOG_RETURN_UINT(0);
-            }
-        }
-        DosExitMustComplete(&ulNesting);
-        FS_RESTORE();
-        LIBCLOG_RETURN_UINT(ERROR_MUTEX_OWNED);
-    }
-
-    for (;;)
-    {
-        ULONG ulCount;
-        rc = DosResetEventSem(sem->hev, &ulCount);
-        if (rc != 0 && rc != ERROR_ALREADY_RESET)
-        {
-            DosExitMustComplete(&ulNesting);
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(rc);
-        }
-        if (__cxchg(&sem->fs, _FMS_OWNED_HARD) == _FMS_AVAILABLE)
-        {
-            __atomic_xchg(&sem->Owner, fibGetTidPid());
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(0);
-        }
-        if (sem->Owner == fibGetTidPid())
-        {
-            DosExitMustComplete(&ulNesting);
-            __fmutex_deadlock(sem, "Recursive mutex!");
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(-1);
-        }
-
-        for (;;)
-        {
-            DosExitMustComplete(&ulNesting);
-            rc = DosWaitEventSem(sem->hev, sem->flags & _FMC_SHARED ? SEM_INDEFINITE_WAIT : 3000);
-            DosEnterMustComplete(&ulNesting);
-            if (rc == ERROR_INTERRUPT)
-            {
-                /*
-                 * An interrupt occured, this might be a bug in the wait, or
-                 * more likely someone is killing us. If we're dying/exiting or
-                 * something along those lines, we return to the caller no matter
-                 * what flags it specified.
-                 */
-                if (!(flags & _FMR_IGNINT))
-                    break;
-                if (fibIsInExit())
-                    break;
-                rc = ERROR_TIMEOUT;
-            }
-            if (rc != ERROR_TIMEOUT)
-                break;
-            /*
-             * Deadlock detection - check if owner is around.
-             */
-            unsigned Owner = sem->Owner;
-            if (!Owner)
-                break;
-            rc = DosVerifyPidTid(Owner >> 16, Owner & 0xffff);
-            if (rc)
-            {
-                DosExitMustComplete(&ulNesting);
-                __fmutex_deadlock(sem, "Owner died!");
-                rc = ERROR_SEM_OWNER_DIED;
-                DosEnterMustComplete(&ulNesting);
-                break;
-            }
-        }
-        FS_RESTORE();
-        if (rc != 0)
-        {
-            DosExitMustComplete(&ulNesting);
-            FS_RESTORE();
-            LIBCLOG_RETURN_UINT(rc);
-        }
-    }
+        __atomic_xchg(&pSem->Owner, fibGetTidPid());
+        rc = 0;
+    }
+    else
+        rc = __fmutex_request_internal(pSem, flags, fs);
+    LIBCLOG_RETURN_UINT(rc);
 }
 
@@ -328 +176 @@
 }
 
-unsigned __fmutex_release_internal_must_complete(_fmutex *sem)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
-    ULONG ulNesting;
-    __atomic_xchg(&sem->Owner, 0);
-    signed char fs = __cxchg(&sem->fs, _FMS_AVAILABLE);
+unsigned __fmutex_release_internal_must_complete(_fmutex *pSem)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s}\n", (void *)pSem, pSem->pszDesc);
+    /** @todo figure out how to do must_complete stuff on NT. */
+    __atomic_xchg(&pSem->Owner, 0);
+    signed char fs = __cxchg(&pSem->fs, _FMS_AVAILABLE);
+    unsigned rc;
     if (fs != _FMS_OWNED_HARD)
-    {
-        FS_VAR_SAVE_LOAD();
-        DosExitMustComplete(&ulNesting);
-        FS_RESTORE();
-        LIBCLOG_RETURN_UINT(0);
-    }
+        rc = 0;
     else
-    {
-        int rc = __fmutex_release_internal (sem);
-        FS_VAR_SAVE_LOAD();
-        DosExitMustComplete(&ulNesting);
-        FS_RESTORE();
-        LIBCLOG_RETURN_UINT(rc);
-    }
-}
-
-unsigned __fmutex_release_internal(_fmutex *sem)
-{
-    LIBCLOG_ENTER("sem=%p{.pszDesc=%s}\n", (void *)sem, sem->pszDesc);
-    unsigned rc;
-    FS_VAR();
-
-    FS_SAVE_LOAD();
-    rc = DosPostEventSem(sem->hev);
-    if (rc != 0 && rc != ERROR_ALREADY_POSTED)
-    {
-        FS_RESTORE();
-        LIBCLOG_RETURN_UINT(rc);
-    }
+        rc = __fmutex_release_internal(pSem);
+    LIBCLOG_RETURN_UINT(rc);
+}
+
+unsigned __fmutex_release_internal(_fmutex *pSem)
+{
+    LIBCLOG_ENTER("pSem=%p{.pszDesc=%s}\n", (void *)pSem, pSem->pszDesc);
+
+
+    NTSTATUS rc = NtSetEvent(pSem->hev, NULL);
+    if (!NT_SUCCESS(rc))
+        LIBCLOG_ERROR_RETURN_UINT(rc);
 
     /* Give up our time slice to give other threads a chance.  Without
@@ -370 +204 @@
        _fmutex semaphore from running, forever.
 
-       Why?  Without DosSleep, the thread will keep the CPU for the rest
-       of the time slice.  It may request (and get) the semaphore again
-       in the same time slice, perhaps multiple times.  Assume that the
-       semaphore is still owned at the end of the time slice.  In one of
-       the next time slices, all the other threads blocking on the
-       semaphore will wake up for a short while only to see that the
-       semaphore is owned; they will all go sleeping again.  The thread
-       which owns the semaphore will get the CPU again.  And may happen
-       to own the semaphore again at the end of the time slice.  And so
-       on.  DosSleep reduces that problem a bit.
-
-       Even with DosSleep(0), assignment of time slices to threads
-       requesting a _fmutex semaphore can be quite unbalanced: The more
-       frequently a thread requests a _fmutex semaphore, the more CPU
-       time it will get.  In consequence, a thread which only rarely
-       needs the resource protected by the _fmutex semaphore will get
-       much less CPU time than threads competing heavily for the
-       resource.
-
-       DosSleep(1) would make _fmutex semaphores behave a bit better,
-       but would also give up way too much CPU time (in the average,
-       half a time slice (or one and a half?) per call of this
-       function).
-
-       DosReleaseMutexSem does a better job; it gives the time slice to
-       the thread which has waited longest on the semaphore (if all the
-       threads have the same priority).
-
-       Unfortunately, we cannot use an HMTX instead of an HEV because
-       only the owner (the thread which got assigned ownership by
-       DosRequestMutexSem) can release the HMTX with DosReleaseMutexSem.
-       If we could, that would take advantage of the FIFO of blocked
-       threads maintained by the kernel for each HMTX.
-
-       Using an HMTX would require the first thread requesting an owned
-       _fmutex semaphore to request the HMTX on behalf of the thread
-       owning the _fmutex semaphore. */
-
-    DosSleep(0);
-    FS_RESTORE();
+      Read the rest of the rant in fmutex-os2.c */
+    ZwYieldExecution();
     LIBCLOG_RETURN_UINT(0);
 }
 
 
-void _fmutex_dummy(_fmutex *sem)
-{
-    LIBCLOG_ENTER("sem=%p\n", (void *)sem);
-    sem->hev = 0;
-    sem->fs = _FMS_AVAILABLE;
-    sem->flags = _FMC_DUMMY;
-    sem->Owner = 0;
-    sem->pszDesc = "dummy";
+void _fmutex_dummy(_fmutex *pSem)
+{
+    LIBCLOG_ENTER("pSem=%p\n", (void *)pSem);
+    pSem->hev = 0;
+    pSem->fs = _FMS_AVAILABLE;
+    pSem->flags = _FMC_DUMMY;
+    pSem->Owner = 0;
+    pSem->pszDesc = "dummy";
     LIBCLOG_RETURN_VOID();
 }

trunk/libc/src/libc/process/nt/smutex-nt.c

@@ -2 +2 @@
 
 #include "libc-alias.h"
-#define INCL_DOSPROCESS
-#define INCL_FSMACROS
-#include <os2.h>
+#include <klibc/nt/nt.h>
 #include <sys/builtin.h>
 #include <sys/smutex.h>
-#include <InnoTekLIBC/FastInfoBlocks.h>
 #include <InnoTekLIBC/backend.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MUTEX
@@ -13 +10 @@
 
 
-void __smutex_request_internal(volatile _smutex *sem)
+void __smutex_request_internal(volatile _smutex *pSem)
 {
-    LIBCLOG_ENTER("sem=%p\n", sem);
-    FS_VAR();
-    FS_SAVE_LOAD();
-    DosSleep(1);
-    while (__cxchg(sem, 1) != 0)
-    {
-        if (fibIsInExit())
-        {
-            __libc_Back_panic(0, NULL, "smutex deadlock: %p\n", sem);
-            break;
-        }
-        DosSleep(1);
-    }
-    FS_RESTORE();
+    LIBCLOG_ENTER("pSem=%p\n", pSem);
+    do
+        ZwYieldExecution();
+    while (__cxchg(pSem, 1));
     LIBCLOG_RETURN_VOID();
 }
+

trunk/libc/src/libc/process/os2/fmutex-os2.c

@@ -362 +362 @@
     {
         FS_RESTORE();
-        LIBCLOG_RETURN_UINT(rc);
+        LIBCLOG_ERROR_RETURN_UINT(rc);
     }