Changeset 1661 for trunk/src/emx/include

Timestamp:

Nov 22, 2004, 2:46:26 AM (21 years ago)

Author:

bird

Message:

Extended fmutex interface.

Location:

trunk/src/emx/include

Files:

• emx/io.h (modified) (1 diff, 1 prop)
• os2emx.h (modified) (1 diff, 1 prop)
• stdio.h (modified) (2 diffs, 1 prop)
• sys/fmutex.h (modified) (2 diffs, 1 prop)

trunk/src/emx/include/emx/io.h

@@ -207 +207 @@
 
 #define STREAM_LOCK(f) \
-  (_fmutex_request(&(f)->__u.__fsem, _FMR_IGNINT) != 0 \
-   ? abort () : (void)0)
+  ((f)->__uVersion != _FILE_STDIO_VERSION ? __stream_abort (f, "version error") \
+   : _fmutex_request(&(f)->__u.__fsem, _FMR_IGNINT) != 0 \
+   ? __stream_abort (f, "fmutex request") : 0)
 
 #define STREAM_UNLOCK(f) \
-  (_fmutex_release(&(f)->__u.__fsem) != 0 ? abort() : (void)0)
+  (_fmutex_release(&(f)->__u.__fsem) != 0 ? __stream_abort (f, "fmutex release") : (void)0)
 
 #define STREAM_LOCK_NOWAIT(f) \
-  (_fmutex_request(&(f)->__u.__fsem, _FMR_NOWAIT) == 0)
-
-#define STREAM_UNLOCKED(f) _fmutex_available(&(f)->__u.__fsem)
+  (((f)->__uVersion == _FILE_STDIO_VERSION || __stream_abort (f, "version error")) && _fmutex_request(&(f)->__u.__fsem, _FMR_NOWAIT) == 0)
+
+#define STREAM_UNLOCKED(f) ((f)->__uVersion == _FILE_STDIO_VERSION && _fmutex_available(&(f)->__u.__fsem))
+
+int __stream_abort(struct _FILE *f, const char *pszMsg);
 
 #endif /* defined (_SYS_FMUTEX_H) */

trunk/src/emx/include/os2emx.h

@@ -13308 +13308 @@
 #define FS_SAVE()       __asm__ __volatile__ ("movl %%fs, %%eax; movl %%eax,%0;" : : "m" (__fs__) : "%eax" )
 #define FS_SAVE_LOAD()  __asm__ __volatile__ ("movl %%fs, %%eax; movl %%eax,%0; movl $DosTIB, %%eax; movl %%eax, %%fs" : : "m" (__fs__) : "%eax" )
+#define FS_VAR_SAVE_LOAD() FS_VAR(); FS_SAVE_LOAD()
 #define FS_RESTORE()    __asm__ __volatile__ ("movl %0, %%eax; movl %%eax,%%fs;" : : "m" (__fs__) : "%eax" )
 #else

trunk/src/emx/include/stdio.h

@@ -178 +178 @@
 #define _FILE_T
 #define _FILE_MEMBERS_HAVE_UNDERSCORE
-struct _file2;
+#define _FILE_STDIO_VERSION     (0x06000000 | sizeof(struct _FILE))
 typedef struct _FILE
 {
+    unsigned __uVersion;
     char * _ptr;
     char * _buffer;
@@ -201 +202 @@
         _fmutex   __fsem;
 #endif
-        char      __rsem_ersatz[8];
+        char      __rsem_ersatz[12];
     } __u;
-    /** Pointer to the stream vector which thie FILE belongs to.
+    /** Pointer to the stream vector which this FILE belongs to.
      * This member is the first which should not be zeroed by _newstream()! */
     void    *__pSV;

trunk/src/emx/include/sys/fmutex.h

@@ -6 +6 @@
 
 #ifndef _SYS_FMUTEX_H
-#define _SYS_FMUTEX_H
+    #define _SYS_FMUTEX_H
 
-#include <stdlib.h> /* need abort */
+    #include <sys/cdefs.h>
+    #include <stdlib.h> /* need abort */
+    #include <InnoTekLIBC/FastInfoBlocks.h>
 
-#if defined (__cplusplus)
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 /* Constants for _fmutex.fs.  See _fmutex_available() for ordering. */
 
-#define _FMS_UNINIT       0
-#define _FMS_AVAILABLE    1
-#define _FMS_OWNED_SIMPLE 2
-#define _FMS_OWNED_HARD   3
+    #define _FMS_UNINIT       0
+    #define _FMS_AVAILABLE    1
+    #define _FMS_OWNED_SIMPLE 2
+    #define _FMS_OWNED_HARD   3
 
 /* Constants for _fmutex_create() */
 
-#define _FMC_SHARED     0x01
+    #define _FMC_SHARED         0x01
+    #define _FMC_MUST_COMPLETE  0x02
+    #define _FMC_DUMMY          0x04    /* internal */
 
 /* Constants for _fmutex_request() */
 
-#define _FMR_IGNINT     0x01
-#define _FMR_NOWAIT     0x02
+    #define _FMR_IGNINT     0x01
+    #define _FMR_NOWAIT     0x02
 
 /* We cannot use __attribute__ ((__packed__)) because G++ does not
    support this. */
 
-#pragma pack(1)
+    #pragma pack(1)
 typedef struct
 {
     /** Handle to event semaphore. */
-    unsigned long hev;
+    unsigned long           hev;
     /** Semaphore status. */
-    __volatile__ signed char fs;
+    volatile signed char    fs;
     /** Semaphore create flags. (_FMC_SHARED) */
-    unsigned char flags;
-    /** padding the struct to 8 bytes. */
-    unsigned char padding[2];
+    unsigned char           flags;
+    /** padding the struct to 16 bytes. */
+    unsigned char           padding[2];
+    /** The (pid << 16) | tid of the owner. */
+    volatile unsigned       Owner;
+    /** Descriptive name of the mutex. */
+    const char             *pszDesc;
 } _fmutex;
-#pragma pack()
+    #pragma pack()
+
 
 
 unsigned __fmutex_request_internal (_fmutex *, unsigned, signed char);
-unsigned __fmutex_create_internal (_fmutex *, unsigned);
+unsigned __fmutex_request_internal_must_complete (_fmutex *, unsigned);
 unsigned __fmutex_release_internal (_fmutex *);
+unsigned __fmutex_release_internal_must_complete (_fmutex *);
 
 
 static __inline__ unsigned _fmutex_request (_fmutex *sem, unsigned flags)
 {
-  signed char fs;
-
-  fs = __cxchg (&sem->fs, _FMS_OWNED_SIMPLE);
-  if (fs == _FMS_AVAILABLE)
-    return 0;
-  else
-    return __fmutex_request_internal (sem, flags, fs);
+    if (!(sem->flags & _FMC_MUST_COMPLETE))
+    {
+        signed char fs = __cxchg (&sem->fs, _FMS_OWNED_SIMPLE);
+        if (fs == _FMS_AVAILABLE)
+        {
+            __atomic_xchg(&sem->Owner, fibGetTidPid());
+            return 0;
+        }
+        else
+            return __fmutex_request_internal (sem, flags, fs);
+    }
+    else
+        return __fmutex_request_internal_must_complete (sem, flags);
 }
 
@@ -67 +81 @@
 static __inline__ unsigned _fmutex_release (_fmutex *sem)
 {
-  signed char fs;
-
-  fs = __cxchg (&sem->fs, _FMS_AVAILABLE);
-  if (fs == _FMS_OWNED_HARD)
-    return __fmutex_release_internal (sem);
-  else
-    return 0;
+    if (!(sem->flags & _FMC_MUST_COMPLETE))
+    {
+        signed char fs;
+        __atomic_xchg(&sem->Owner, 0);
+        fs = __cxchg(&sem->fs, _FMS_AVAILABLE);
+        if (fs != _FMS_OWNED_HARD)
+            return 0;
+        else
+            return __fmutex_release_internal (sem);
+    }
+    else
+        return __fmutex_release_internal_must_complete (sem);
 }
-
 
 static __inline__ int _fmutex_available (_fmutex *sem)
 {
-  return sem->fs <= _FMS_AVAILABLE;
+    return sem->fs <= _FMS_AVAILABLE;
 }
 
 
 unsigned _fmutex_create (_fmutex *, unsigned);
+unsigned _fmutex_create2 (_fmutex *sem, unsigned, const char *);
 unsigned _fmutex_open (_fmutex *);
 unsigned _fmutex_close (_fmutex *);
 void _fmutex_dummy (_fmutex *);
 
-void _fmutex_checked_close (_fmutex *);
-void _fmutex_checked_create (_fmutex *, unsigned);
-void _fmutex_checked_open (_fmutex *);
+void _fmutex_checked_close(_fmutex *);
+void _fmutex_checked_create(_fmutex *, unsigned);
+void _fmutex_checked_create2(_fmutex *, unsigned, const char *);
+void _fmutex_checked_open(_fmutex *);
+void _fmutex_abort(_fmutex *, const char *);
 
 static __inline__ void _fmutex_checked_release (_fmutex * sem)
 {
-  if (_fmutex_release (sem) != 0)
-    abort ();
+    if (sem->Owner != fibGetTidPid())
+        _fmutex_abort(sem, "release not owner");
+    if (_fmutex_release (sem) != 0)
+        _fmutex_abort(sem, "release");
 }
 
 static __inline__ void _fmutex_checked_request (_fmutex * sem, unsigned flags)
 {
-  if (_fmutex_request (sem, flags) != 0)
-    abort ();
+    if (_fmutex_request (sem, flags) != 0)
+        _fmutex_abort(sem, "request");
 }
 
-#if defined (__cplusplus)
-}
-#endif
+__END_DECLS
 
 #endif /* not _SYS_FMUTEX_H */
+