Changeset 2027 for trunk/src/emx/include/sys/fmutex.h

Timestamp:

Jun 13, 2005, 11:29:07 PM (20 years ago)

Author:

bird

Message:

Auto init fmutexes. fixed deadlock for the must-complete variant.

File:

• trunk/src/emx/include/sys/fmutex.h (modified) (3 diffs, 1 prop)

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

@@ -6 +6 @@
 
 #ifndef _SYS_FMUTEX_H
-    #define _SYS_FMUTEX_H
+#define _SYS_FMUTEX_H
 
-    #include <sys/cdefs.h>
-    #include <stdlib.h> /* need abort */
-    #include <InnoTekLIBC/FastInfoBlocks.h>
+#include <sys/cdefs.h>
+#include <stdlib.h> /* need abort */
+#include <InnoTekLIBC/FastInfoBlocks.h>
+#include <386/builtin.h>
 
 __BEGIN_DECLS
@@ -16 +17 @@
 /* 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_AUTO_INITIALIZE    (-1)
+#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_MUST_COMPLETE  0x02
-    #define _FMC_DUMMY          0x04    /* internal */
+#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
 {
@@ -51 +53 @@
     const char             *pszDesc;
 } _fmutex;
-    #pragma pack()
+#pragma pack()
 
+#define _FMUTEX_INITIALIZER                         _FMUTEX_INITIALIZER_EX(0, __FILE__)
+#define _FMUTEX_INITIALIZER_EX(fFlags, pszDesc)     { 0, _FMS_AUTO_INITIALIZE, fFlags, {0x42,0x42}, 0, pszDesc }