From 631b3c8967a329cdd53e54365e4e4c0aa93a4251 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 23 May 2016 11:40:18 +0200 Subject: score: Move thread queue MP callout to context Drop the multiprocessing (MP) dependent callout parameter from the thread queue extract, dequeue, flush and unblock methods. Merge this parameter with the lock context into new structure Thread_queue_Context. This helps to gets rid of the conditionally compiled method call helpers. --- cpukit/posix/src/mqueuenotify.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cpukit/posix/src/mqueuenotify.c') diff --git a/cpukit/posix/src/mqueuenotify.c b/cpukit/posix/src/mqueuenotify.c index adcfdcb8f2..a1f9a089f8 100644 --- a/cpukit/posix/src/mqueuenotify.c +++ b/cpukit/posix/src/mqueuenotify.c @@ -24,7 +24,7 @@ static void _POSIX_Message_queue_Notify_handler( CORE_message_queue_Control *the_message_queue, - ISR_lock_Context *lock_context + Thread_queue_Context *queue_context ) { POSIX_Message_queue_Control *the_mq; @@ -38,7 +38,7 @@ static void _POSIX_Message_queue_Notify_handler( signo = the_mq->notification.sigev_signo; _CORE_message_queue_Set_notify( &the_mq->Message_queue, NULL ); - _CORE_message_queue_Release( &the_mq->Message_queue, lock_context ); + _CORE_message_queue_Release( &the_mq->Message_queue, queue_context ); kill( getpid(), signo ); } @@ -49,9 +49,9 @@ int mq_notify( ) { POSIX_Message_queue_Control *the_mq; - ISR_lock_Context lock_context; + Thread_queue_Context queue_context; - the_mq = _POSIX_Message_queue_Get( mqdes, &lock_context ); + the_mq = _POSIX_Message_queue_Get( mqdes, &queue_context ); if ( the_mq == NULL ) { rtems_set_errno_and_return_minus_one( EBADF ); @@ -59,17 +59,17 @@ int mq_notify( _CORE_message_queue_Acquire_critical( &the_mq->Message_queue, - &lock_context + &queue_context ); if ( the_mq->open_count == 0 ) { - _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context ); + _CORE_message_queue_Release( &the_mq->Message_queue, &queue_context ); rtems_set_errno_and_return_minus_one( EBADF ); } if ( notification != NULL ) { if ( _CORE_message_queue_Is_notify_enabled( &the_mq->Message_queue ) ) { - _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context ); + _CORE_message_queue_Release( &the_mq->Message_queue, &queue_context ); rtems_set_errno_and_return_minus_one( EBUSY ); } @@ -83,6 +83,6 @@ int mq_notify( _CORE_message_queue_Set_notify( &the_mq->Message_queue, NULL ); } - _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context ); + _CORE_message_queue_Release( &the_mq->Message_queue, &queue_context ); return 0; } -- cgit v1.2.3