From 80b3c938ce9798997c59cc102fb6738475f6fe32 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 17 May 2021 16:55:15 +0200 Subject: score: Move _Thread_queue_Queue_get_name_and_id() Move this diagnostic function to a separate file since it does not provide a core function of the system. Change license to BSD-2-Clause according to file history and re-licensing agreement. Update #3053. --- cpukit/Makefile.am | 1 + cpukit/score/src/threadq.c | 36 ---------------- cpukit/score/src/threadqgetnameandid.c | 76 ++++++++++++++++++++++++++++++++++ spec/build/cpukit/librtemscpu.yml | 1 + 4 files changed, 78 insertions(+), 36 deletions(-) create mode 100644 cpukit/score/src/threadqgetnameandid.c diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index a5f3a9665f..db025ac6f8 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -985,6 +985,7 @@ librtemscpu_a_SOURCES += score/src/threadqenqueue.c librtemscpu_a_SOURCES += score/src/threadqextractwithproxy.c librtemscpu_a_SOURCES += score/src/threadqfirst.c librtemscpu_a_SOURCES += score/src/threadqflush.c +librtemscpu_a_SOURCES += score/src/threadqgetnameandid.c librtemscpu_a_SOURCES += score/src/threadqops.c librtemscpu_a_SOURCES += score/src/threadqtimeout.c librtemscpu_a_SOURCES += score/src/timespecaddto.c diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c index 55d8760f7c..e322b46b5e 100644 --- a/cpukit/score/src/threadq.c +++ b/cpukit/score/src/threadq.c @@ -25,11 +25,7 @@ #include "config.h" #endif -#include - #include -#include -#include RTEMS_STATIC_ASSERT( #if defined(RTEMS_SMP) @@ -166,35 +162,3 @@ void _Thread_queue_MP_callout_do_nothing( /* Do nothing */ } #endif - -size_t _Thread_queue_Queue_get_name_and_id( - const Thread_queue_Queue *queue, - char *buffer, - size_t buffer_size, - Objects_Id *id -) -{ - const char *name; - - name = queue->name; - - if ( name == _Thread_queue_Object_name ) { - const Thread_queue_Object *queue_object; - - queue_object = THREAD_QUEUE_QUEUE_TO_OBJECT( queue ); - *id = queue_object->Object.id; - return _Objects_Name_to_string( - queue_object->Object.name, - false, - buffer, - buffer_size - ); - } else { - if ( name == NULL ) { - name = _Thread_queue_Object_name; - } - - *id = 0; - return strlcpy( buffer, name, buffer_size ); - } -} diff --git a/cpukit/score/src/threadqgetnameandid.c b/cpukit/score/src/threadqgetnameandid.c new file mode 100644 index 0000000000..ea4e2203e6 --- /dev/null +++ b/cpukit/score/src/threadqgetnameandid.c @@ -0,0 +1,76 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSScoreThreadQueue + * + * @brief This source file contains the implementation of + * _Thread_queue_Queue_get_name_and_id(). + */ + +/* + * Copyright (C) 2017 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 +#include + +#include + +size_t _Thread_queue_Queue_get_name_and_id( + const Thread_queue_Queue *queue, + char *buffer, + size_t buffer_size, + Objects_Id *id +) +{ + const char *name; + + name = queue->name; + + if ( name == _Thread_queue_Object_name ) { + const Thread_queue_Object *queue_object; + + queue_object = THREAD_QUEUE_QUEUE_TO_OBJECT( queue ); + *id = queue_object->Object.id; + return _Objects_Name_to_string( + queue_object->Object.name, + false, + buffer, + buffer_size + ); + } else { + if ( name == NULL ) { + name = _Thread_queue_Object_name; + } + + *id = 0; + return strlcpy( buffer, name, buffer_size ); + } +} diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index efd0d1bfe1..7f1ccf79c4 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -1543,6 +1543,7 @@ source: - cpukit/score/src/threadqextractwithproxy.c - cpukit/score/src/threadqfirst.c - cpukit/score/src/threadqflush.c +- cpukit/score/src/threadqgetnameandid.c - cpukit/score/src/threadqops.c - cpukit/score/src/threadqtimeout.c - cpukit/score/src/threadrestart.c -- cgit v1.2.3