Changeset 2545646 in rtems

Timestamp:

Nov 22, 1999, 4:12:19 PM (21 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

cb3c1718

Parents:

94f81bbd

Message:

+ Updated comments.
+ Corrected enable/disable of dispatch.

Files:

• c/src/exec/posix/src/semopen.c (modified) (8 diffs)
• cpukit/posix/src/semopen.c (modified) (8 diffs)

c/src/exec/posix/src/semopen.c

@@ -18 +18 @@
 
 /*PAGE
+ *
+ *  sem_open
+ *  
+ *  Opens a named semaphore.  Used in conjunction with the sem_close
+ *  and sem_unlink commands.
  *
  *  11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221
@@ -40 +45 @@
   POSIX_Semaphore_Control   *the_semaphore;
   Objects_Locations          location;
- 
+   
+  _Thread_Disable_dispatch();
 
   if ( oflag & O_CREAT ) {
@@ -61 +67 @@
 
     /*
-     * Unless we are willing to create name -> ID translation failure is
-     * an error.
+     * Unless provided a valid name that did not already exist
+     * and we are willing to create then it is an error.
      */
 
-    if ( status == EINVAL ) { 
-      if ( !(oflag & O_CREAT) ) {
-        set_errno_and_return_minus_one_cast( ENOENT, sem_t * );
-      }
+    if ( !( status == ENOENT && (oflag & O_CREAT) ) ) {
+      _Thread_Enable_dispatch();
+      set_errno_and_return_minus_one_cast( status, sem_t * );
     }
-
   } else { 
 
@@ -78 +82 @@
 
     if ( (oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL) ) {
+      _Thread_Enable_dispatch();
       set_errno_and_return_minus_one_cast( EEXIST, sem_t * );
     }
@@ -83 +88 @@
     the_semaphore = _POSIX_Semaphore_Get( &the_semaphore_id, &location );
     the_semaphore->open_count += 1;
+    _Thread_Enable_dispatch();
+    _Thread_Enable_dispatch();
     return (sem_t *)&the_semaphore->Object.id;
 
@@ -92 +99 @@
    */
 
-  status = _POSIX_Semaphore_Create_support(
+  status =_POSIX_Semaphore_Create_support(
     name,
     FALSE,         /* not shared across processes */
@@ -103 +110 @@
    */
 
+  _Thread_Enable_dispatch();
+
   if ( status == -1 )
     return SEM_FAILED;
@@ -108 +117 @@
   return (sem_t *) &the_semaphore->Object.id;
 }
+
+

cpukit/posix/src/semopen.c

@@ -18 +18 @@
 
 /*PAGE
+ *
+ *  sem_open
+ *  
+ *  Opens a named semaphore.  Used in conjunction with the sem_close
+ *  and sem_unlink commands.
  *
  *  11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221
@@ -40 +45 @@
   POSIX_Semaphore_Control   *the_semaphore;
   Objects_Locations          location;
- 
+   
+  _Thread_Disable_dispatch();
 
   if ( oflag & O_CREAT ) {
@@ -61 +67 @@
 
     /*
-     * Unless we are willing to create name -> ID translation failure is
-     * an error.
+     * Unless provided a valid name that did not already exist
+     * and we are willing to create then it is an error.
      */
 
-    if ( status == EINVAL ) { 
-      if ( !(oflag & O_CREAT) ) {
-        set_errno_and_return_minus_one_cast( ENOENT, sem_t * );
-      }
+    if ( !( status == ENOENT && (oflag & O_CREAT) ) ) {
+      _Thread_Enable_dispatch();
+      set_errno_and_return_minus_one_cast( status, sem_t * );
     }
-
   } else { 
 
@@ -78 +82 @@
 
     if ( (oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL) ) {
+      _Thread_Enable_dispatch();
       set_errno_and_return_minus_one_cast( EEXIST, sem_t * );
     }
@@ -83 +88 @@
     the_semaphore = _POSIX_Semaphore_Get( &the_semaphore_id, &location );
     the_semaphore->open_count += 1;
+    _Thread_Enable_dispatch();
+    _Thread_Enable_dispatch();
     return (sem_t *)&the_semaphore->Object.id;
 
@@ -92 +99 @@
    */
 
-  status = _POSIX_Semaphore_Create_support(
+  status =_POSIX_Semaphore_Create_support(
     name,
     FALSE,         /* not shared across processes */
@@ -103 +110 @@
    */
 
+  _Thread_Enable_dispatch();
+
   if ( status == -1 )
     return SEM_FAILED;
@@ -108 +117 @@
   return (sem_t *) &the_semaphore->Object.id;
 }
+
+