1 files changed, 25 insertions, 36 deletions

diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index ff9f3ec220..3ee587ccfb 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -20,7 +20,6 @@
 
 #include <rtems/score/coremsgimpl.h>
 #include <rtems/score/objectimpl.h>
-#include <rtems/score/thread.h>
 
 CORE_message_queue_Status _CORE_message_queue_Broadcast(
   CORE_message_queue_Control                *the_message_queue,
@@ -33,55 +32,45 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast(
     Objects_Id                                 id __attribute__((unused)),
     CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support __attribute__((unused)),
   #endif
-  uint32_t                                  *count
+  uint32_t                                  *count,
+  ISR_lock_Context                          *lock_context
 )
 {
-  Thread_Control          *the_thread;
-  uint32_t                 number_broadcasted;
-  Thread_Wait_information *waitp;
+  Thread_Control             *the_thread;
+  uint32_t                    number_broadcasted;
 
   if ( size > the_message_queue->maximum_message_size ) {
+    _ISR_lock_ISR_enable( lock_context );
     return CORE_MESSAGE_QUEUE_STATUS_INVALID_SIZE;
   }
 
-  /*
-   *  If there are pending messages, then there can't be threads
-   *  waiting for us to send them a message.
-   *
-   *  NOTE: This check is critical because threads can block on
-   *        send and receive and this ensures that we are broadcasting
-   *        the message to threads waiting to receive -- not to send.
-   */
+  number_broadcasted = 0;
 
-  if ( the_message_queue->number_of_pending_messages != 0 ) {
-    *count = 0;
-    return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
-  }
+  _CORE_message_queue_Acquire_critical( the_message_queue, lock_context );
 
-  /*
-   *  There must be no pending messages if there is a thread waiting to
-   *  receive a message.
-   */
-  number_broadcasted = 0;
-  while ((the_thread =
-          _Thread_queue_Dequeue(&the_message_queue->Wait_queue))) {
-    waitp = &the_thread->Wait;
+  while (
+    ( the_thread =
+      _CORE_message_queue_Dequeue_receiver(
+        the_message_queue,
+        buffer,
+        size,
+        0,
+        lock_context
+      )
+    )
+  ) {
     number_broadcasted += 1;
 
-    _CORE_message_queue_Copy_buffer(
-      buffer,
-      waitp->return_argument_second.mutable_object,
-      size
-    );
+#if defined(RTEMS_MULTIPROCESSING)
+    if ( !_Objects_Is_local_id( the_thread->Object.id ) )
+      (*api_message_queue_mp_support) ( the_thread, id );
+#endif
 
-    *(size_t *) the_thread->Wait.return_argument = size;
+    _CORE_message_queue_Acquire( the_message_queue, lock_context );
+  }
 
-    #if defined(RTEMS_MULTIPROCESSING)
-      if ( !_Objects_Is_local_id( the_thread->Object.id ) )
-        (*api_message_queue_mp_support) ( the_thread, id );
-    #endif
+  _CORE_message_queue_Release( the_message_queue, lock_context );
 
-  }
   *count = number_broadcasted;
   return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
 }