Changeset 101e9b0 in rtems

Timestamp:

Nov 22, 1999, 4:14:00 PM (22 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

7dbb0bd

Parents:

cb3c1718

Message:

Fixed dispatching and cleaned up code.

Files:

• c/src/exec/posix/src/semaphoredeletesupp.c (modified) (1 diff)
• c/src/exec/posix/src/semdestroy.c (modified) (1 diff)
• cpukit/posix/src/semaphoredeletesupp.c (modified) (1 diff)
• cpukit/posix/src/semdestroy.c (modified) (1 diff)

c/src/exec/posix/src/semaphoredeletesupp.c

@@ -27 +27 @@
 {
   if ( !the_semaphore->linked && !the_semaphore->open_count ) {
+      _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
+ 
+      _CORE_semaphore_Flush(
+        &the_semaphore->Semaphore,
+#if defined(RTEMS_MULTIPROCESSING)
+        _POSIX_Semaphore_MP_Send_object_was_deleted,
+#else
+        NULL,
+#endif
+        -1  /* XXX should also seterrno -> EINVAL */
+      );
+
     _POSIX_Semaphore_Free( the_semaphore );
 

c/src/exec/posix/src/semdestroy.c

@@ -43 +43 @@
 
       if ( the_semaphore->named == TRUE ) {
+        _Thread_Enable_dispatch();
         set_errno_and_return_minus_one( EINVAL );
       }
  
-      _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
- 
-      _CORE_semaphore_Flush(
-        &the_semaphore->Semaphore,
-#if defined(RTEMS_MULTIPROCESSING)
-        _POSIX_Semaphore_MP_Send_object_was_deleted,
-#else
-        NULL,
-#endif
-        -1  /* XXX should also seterrno -> EINVAL */
-      );
- 
-      _POSIX_Semaphore_Free( the_semaphore );
- 
-#if defined(RTEMS_MULTIPROCESSING)
-      if ( the_semaphore->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-        _Objects_MP_Close(
-          &_POSIX_Semaphore_Information,
-          the_semaphore->Object.id
-        );
- 
-        _POSIX_Semaphore_MP_Send_process_packet(
-          POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE,
-          the_semaphore->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-#endif
+      _POSIX_Semaphore_Delete( the_semaphore );
       _Thread_Enable_dispatch();
       return 0;

cpukit/posix/src/semaphoredeletesupp.c

@@ -27 +27 @@
 {
   if ( !the_semaphore->linked && !the_semaphore->open_count ) {
+      _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
+ 
+      _CORE_semaphore_Flush(
+        &the_semaphore->Semaphore,
+#if defined(RTEMS_MULTIPROCESSING)
+        _POSIX_Semaphore_MP_Send_object_was_deleted,
+#else
+        NULL,
+#endif
+        -1  /* XXX should also seterrno -> EINVAL */
+      );
+
     _POSIX_Semaphore_Free( the_semaphore );
 

cpukit/posix/src/semdestroy.c

@@ -43 +43 @@
 
       if ( the_semaphore->named == TRUE ) {
+        _Thread_Enable_dispatch();
         set_errno_and_return_minus_one( EINVAL );
       }
  
-      _Objects_Close( &_POSIX_Semaphore_Information, &the_semaphore->Object );
- 
-      _CORE_semaphore_Flush(
-        &the_semaphore->Semaphore,
-#if defined(RTEMS_MULTIPROCESSING)
-        _POSIX_Semaphore_MP_Send_object_was_deleted,
-#else
-        NULL,
-#endif
-        -1  /* XXX should also seterrno -> EINVAL */
-      );
- 
-      _POSIX_Semaphore_Free( the_semaphore );
- 
-#if defined(RTEMS_MULTIPROCESSING)
-      if ( the_semaphore->process_shared == PTHREAD_PROCESS_SHARED ) {
- 
-        _Objects_MP_Close(
-          &_POSIX_Semaphore_Information,
-          the_semaphore->Object.id
-        );
- 
-        _POSIX_Semaphore_MP_Send_process_packet(
-          POSIX_SEMAPHORE_MP_ANNOUNCE_DELETE,
-          the_semaphore->Object.id,
-          0,                         /* Not used */
-          0                          /* Not used */
-        );
-      }
-#endif
+      _POSIX_Semaphore_Delete( the_semaphore );
       _Thread_Enable_dispatch();
       return 0;