diff options
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/src/coremsg.c | 17 | ||||
| -rw-r--r-- | cpukit/score/src/coremsgclose.c | 7 | ||||
| -rw-r--r-- | cpukit/score/src/coremsgwkspace.c | 53 |
3 files changed, 68 insertions, 9 deletions
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c index f7caca1ebf..967ce2355a 100644 --- a/cpukit/score/src/coremsg.c +++ b/cpukit/score/src/coremsg.c @@ -20,7 +20,6 @@ #include <rtems/score/coremsgimpl.h> #include <rtems/score/assert.h> -#include <rtems/score/wkspace.h> #define MESSAGE_SIZE_LIMIT \ ( SIZE_MAX - sizeof( uintptr_t ) + 1 - sizeof( CORE_message_queue_Buffer ) ) @@ -32,10 +31,12 @@ RTEMS_STATIC_ASSERT( ); Status_Control _CORE_message_queue_Initialize( - CORE_message_queue_Control *the_message_queue, - CORE_message_queue_Disciplines discipline, - uint32_t maximum_pending_messages, - size_t maximum_message_size + CORE_message_queue_Control *the_message_queue, + CORE_message_queue_Disciplines discipline, + uint32_t maximum_pending_messages, + size_t maximum_message_size, + CORE_message_queue_Allocate_buffers allocate_buffers, + const void *arg ) { size_t buffer_size; @@ -56,8 +57,10 @@ Status_Control _CORE_message_queue_Initialize( return STATUS_MESSAGE_QUEUE_INVALID_NUMBER; } - the_message_queue->message_buffers = _Workspace_Allocate( - (size_t) maximum_pending_messages * buffer_size + the_message_queue->message_buffers = ( *allocate_buffers )( + the_message_queue, + (size_t) maximum_pending_messages * buffer_size, + arg ); if ( the_message_queue->message_buffers == NULL ) { diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c index 18b49b096c..98032dd3ad 100644 --- a/cpukit/score/src/coremsgclose.c +++ b/cpukit/score/src/coremsgclose.c @@ -19,7 +19,6 @@ #endif #include <rtems/score/coremsgimpl.h> -#include <rtems/score/wkspace.h> static Thread_Control *_CORE_message_queue_Was_deleted( Thread_Control *the_thread, @@ -50,7 +49,11 @@ void _CORE_message_queue_Close( queue_context ); - (void) _Workspace_Free( the_message_queue->message_buffers ); + if ( the_message_queue->free_message_buffers != NULL ) { + ( *the_message_queue->free_message_buffers )( + the_message_queue->message_buffers + ); + } _Thread_queue_Destroy( &the_message_queue->Wait_queue ); } diff --git a/cpukit/score/src/coremsgwkspace.c b/cpukit/score/src/coremsgwkspace.c new file mode 100644 index 0000000000..8441701813 --- /dev/null +++ b/cpukit/score/src/coremsgwkspace.c @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSScoreMessageQueue + * + * @brief This source file contains the implementation of + * _CORE_message_queue_Workspace_allocate(). + */ + +/* + * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/score/coremsgimpl.h> +#include <rtems/score/wkspace.h> + +void *_CORE_message_queue_Workspace_allocate( + CORE_message_queue_Control *the_message_queue, + size_t size, + const void *arg +) +{ + (void) arg; + the_message_queue->free_message_buffers = _Workspace_Free; + return _Workspace_Allocate( size ); +} |