From c8982e5f6a4857444676165deab1e08dc91a6847 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 26 Apr 2016 21:20:31 +0200 Subject: posix: Simplify message queues The mq_open() function returns a descriptor to a POSIX message queue object identified by a name. This is similar to sem_open(). In contrast to the POSIX semaphore the POSIX message queues use a separate object for the descriptor. This extra object is superfluous, since the object identifier can be used directly for this purpose, just like for the semaphores. Update #2702. Update #2555. --- testsuites/sptests/spthreadq01/init.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c index fb2be649b5..cb8d495e79 100644 --- a/testsuites/sptests/spthreadq01/init.c +++ b/testsuites/sptests/spthreadq01/init.c @@ -25,8 +25,6 @@ #include #include #include - - #include #endif const char rtems_test_name[] = "SPTHREADQ 1"; @@ -121,9 +119,6 @@ static void posix_worker(test_context *ctx) int rv; int eno; char buf[1]; - POSIX_Message_queue_Control_fd *the_mq_fd; - Objects_Locations location; - ISR_lock_Context lock_context; wake_up_master(ctx); rtems_test_assert(get_wait_id(ctx) == ctx->psem); @@ -161,15 +156,7 @@ static void posix_worker(test_context *ctx) rtems_test_assert(eno == 0); wake_up_master(ctx); - the_mq_fd = _POSIX_Message_queue_Get_fd_interrupt_disable( - ctx->pmq, - &location, - &lock_context - ); - _ISR_lock_ISR_enable(&lock_context); - rtems_test_assert(the_mq_fd != NULL); - rtems_test_assert(location == OBJECTS_LOCAL); - rtems_test_assert(get_wait_id(ctx) == the_mq_fd->Queue->Object.id); + rtems_test_assert(get_wait_id(ctx) == ctx->pmq); buf[0] = 'x'; rv = mq_send(ctx->pmq, &buf[0], sizeof(buf), 0); @@ -397,7 +384,6 @@ static rtems_task Init( #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 1 #define CONFIGURE_MAXIMUM_POSIX_RWLOCKS 1 #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES 1 - #define CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUE_DESCRIPTORS 1 #define CONFIGURE_MESSAGE_BUFFER_MEMORY \ (2 * CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(1, 1)) #else -- cgit v1.2.3