Changeset 1131

Timestamp:

Feb 1, 2004, 12:53:27 AM (22 years ago)

Author:

bird

Message:

Fixed deadlock problem, when libc_FH() imports a handle.

File:

• trunk/src/emx/src/lib/sys/filehandles.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/lib/sys/filehandles.c

@@ -63 +63 @@
 *******************************************************************************/
 static int __libc_fhMoreHandles(unsigned cMin);
+static int __libc_fhAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh, int fOwnSem);
 
 
@@ -197 +198 @@
          * Allocate handle and initialize handle.
          */
-        rc = __libc_FHAllocate(i, fLibc, sizeof(LIBCFH), NULL, NULL, NULL);
+        rc = __libc_fhAllocate(i, fLibc, sizeof(LIBCFH), NULL, NULL, NULL, 1);
         if (rc)
         {
@@ -422 +423 @@
  * @param   ppFH    Where to store the allocated file handle struct pointer. (NULL allowed)
  * @param   pfh     Where to store the number of the filehandle allocated.
+ * @param   fOwnSem Set if we should not take or release the semaphore.
  * @remark  The preallocated handles make this function somewhat big and messy.
  */
-int __libc_FHAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh)
+static int __libc_fhAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh, int fOwnSem)
 {
     PLIBCFH     pFH;
@@ -445 +447 @@
      * Now take the lock.
      */
-    if (_fmutex_request(&gmtx, 0))
+    if (!fOwnSem && _fmutex_request(&gmtx, 0))
         return -1;
 
@@ -582 +584 @@
         *pfh = fh;
 
-    _fmutex_release(&gmtx);
+    if (!fOwnSem)
+        _fmutex_release(&gmtx);
     return rc;
 }
+
+/**
+ * Allocates a file handle.
+ *
+ * @returns 0 on success.
+ * @returns OS/2 error code and errno set to the corresponding error number.
+ * @param   fh      Number of the filehandle to allocate.
+ *                  Will fail if the handle is in use.
+ *                  Use -1 for any handle.
+ * @param   fFlags  Initial flags.
+ * @param   cb      Size of the file handle.
+ *                  Must not be less than the mandatory size (sizeof(LIBCFH)).
+ * @param   pOps    Value of the pOps field, NULL not allowed.
+ * @param   ppFH    Where to store the allocated file handle struct pointer. (NULL allowed)
+ * @param   pfh     Where to store the number of the filehandle allocated.
+ * @remark  The preallocated handles make this function somewhat big and messy.
+ */
+int __libc_FHAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh)
+{
+    return __libc_fhAllocate(fh, fFlags, cb, pOps, ppFH, pfh, 0);
+}
+
 
 /**
@@ -749 +774 @@
                  * Allocate a new handle for this filehandle.
                  */
-                rc = __libc_FHAllocate(fh, fLibc, sizeof(LIBCFH), NULL, &pFH, NULL);
+                rc = __libc_fhAllocate(fh, fLibc, sizeof(LIBCFH), NULL, &pFH, NULL, 1);
                 if (rc)
                     pFH = NULL;