Changeset 2299 for trunk/src/emx/include

Timestamp:

Aug 22, 2005, 3:56:25 AM (20 years ago)

Author:

bird

Message:

Merged the signal semaphore handling into the safe sems and made signals use them.

File:

• trunk/src/emx/include/InnoTekLIBC/backend.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -967 +967 @@
  * @{ */
 
-/** 
+/**
  * Safe Mutex Semaphore structure.
  *
- * For shared semaphores this structure must be in shared memory so all users 
+ * For shared semaphores this structure must be in shared memory so all users
  * actually use the very same structure.
  */
@@ -977 +977 @@
 #ifdef __OS2__
     /** Mutex handle. */
-    unsigned long hmtx;
-#endif 
+    unsigned long       hmtx;
+#endif
+    /** Set if the semaphore is shared. */
+    unsigned            fShared;
 } __LIBC_SAFESEMMTX;
 /** Pointer to a SAFESEM Mutex structure. */
@@ -1030 +1032 @@
 
 
-/** 
+/**
  * Safe Event Semaphore structure.
  *
- * For shared semaphores this structure must be in shared memory so all users 
+ * For shared semaphores this structure must be in shared memory so all users
  * actually use the very same structure.
  *
- * @remark  The event semaphore business is difficult because the lack of 
- *          atomic mutex release + event wait apis in OS/2. We have to 
+ * @remark  The event semaphore business is difficult because the lack of
+ *          atomic mutex release + event wait apis in OS/2. We have to
  *          jump around the place to get this working nearly safly...
  */
@@ -1045 +1047 @@
     /** The event semaphore. */
     unsigned long       hev;
-#endif 
+#endif
     /** Number of threads which are supposed to be blocking on the above event semaphore. */
     uint32_t volatile   cWaiters;
     /** The mutex semaphore used to protect the event semaphore. */
     __LIBC_PSAFESEMMTX  pmtx;
-    /** Set if the semaphore is shared. 
-     * If shared this structure is allocated from SPM, else it's from the heap. */
+    /** Set if the semaphore is shared. */
     unsigned            fShared;
 } __LIBC_SAFESEMEV;
@@ -1071 +1072 @@
  * Opens a shared safe event sem.
  *
- * The caller is responsible for opening the associated mutex 
+ * The caller is responsible for opening the associated mutex
  * semaphore before calling this function.
  *
@@ -1092 +1093 @@
  * Sleep on a semaphore.
  *
- * The caller must own the associated mutex semaphore. The mutex semaphore will 
- * be released as we go to sleep and reclaimed when we wake up. 
- *
- * The pfnComplete callback is used to correct state before signals are handled. 
+ * The caller must own the associated mutex semaphore. The mutex semaphore will
+ * be released as we go to sleep and reclaimed when we wake up.
+ *
+ * The pfnComplete callback is used to correct state before signals are handled.
  * It will always be called be for this function returns, and it'll either be under
  * the protection of the signal mutex or the associated mutex (both safe sems).
  *
- * This is the most difficult thing we're doing in this API. On OS/2 we have 
+ * This is the most difficult thing we're doing in this API. On OS/2 we have
  * potential (at least theoretically) race conditions...
  *