summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-04-26 10:15:05 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-04-30 07:56:28 +0200
commit8b15a3242e2f7089e013e1ced599850c943f751f (patch)
treecdd759c8216f54da261aba01fdac713337a60e25
parent09063212d483a87e78fb180dddb4dc8d8a6f57ee (diff)
downloadrtems-8b15a3242e2f7089e013e1ced599850c943f751f.tar.bz2
Use alias for rtems_task_self() and pthread_self()
This may reduce the code size a bit.
-rw-r--r--cpukit/Makefile.am3
-rw-r--r--cpukit/include/rtems/score/threadimpl.h7
-rw-r--r--cpukit/posix/src/pthreadself.c32
-rw-r--r--cpukit/rtems/src/taskself.c28
-rw-r--r--cpukit/score/src/threadselfid.c53
-rw-r--r--spec/build/cpukit/librtemscpu.yml3
6 files changed, 62 insertions, 64 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 44ab945778..c9600f7242 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -620,7 +620,6 @@ librtemscpu_a_SOURCES += posix/src/pthreadgetschedparam.c
librtemscpu_a_SOURCES += posix/src/pthreadinitthreads.c
librtemscpu_a_SOURCES += posix/src/pthreadjoin.c
librtemscpu_a_SOURCES += posix/src/pthreadonce.c
-librtemscpu_a_SOURCES += posix/src/pthreadself.c
librtemscpu_a_SOURCES += posix/src/pthreadsetaffinitynp.c
librtemscpu_a_SOURCES += posix/src/pthreadsetnamenp.c
librtemscpu_a_SOURCES += posix/src/pthreadsetschedparam.c
@@ -800,7 +799,6 @@ librtemscpu_a_SOURCES += rtems/src/taskmode.c
librtemscpu_a_SOURCES += rtems/src/taskrestart.c
librtemscpu_a_SOURCES += rtems/src/taskresume.c
librtemscpu_a_SOURCES += rtems/src/tasks.c
-librtemscpu_a_SOURCES += rtems/src/taskself.c
librtemscpu_a_SOURCES += rtems/src/tasksetaffinity.c
librtemscpu_a_SOURCES += rtems/src/tasksetpriority.c
librtemscpu_a_SOURCES += rtems/src/tasksetscheduler.c
@@ -964,6 +962,7 @@ librtemscpu_a_SOURCES += score/src/threadinitialize.c
librtemscpu_a_SOURCES += score/src/threadidledefault.c
librtemscpu_a_SOURCES += score/src/threadloadenv.c
librtemscpu_a_SOURCES += score/src/threadrestart.c
+librtemscpu_a_SOURCES += score/src/threadselfid.c
librtemscpu_a_SOURCES += score/src/threadsetstate.c
librtemscpu_a_SOURCES += score/src/threadstackallocate.c
librtemscpu_a_SOURCES += score/src/threadstackfree.c
diff --git a/cpukit/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h
index 5dfd142b92..c861e8b119 100644
--- a/cpukit/include/rtems/score/threadimpl.h
+++ b/cpukit/include/rtems/score/threadimpl.h
@@ -904,6 +904,13 @@ Thread_Control *_Thread_Get(
);
/**
+ * @brief Gets the identifier of the calling thread.
+ *
+ * @return Returns the identifier of the calling thread.
+ */
+Objects_Id _Thread_Self_id( void );
+
+/**
* @brief Gets the cpu of the thread's scheduler.
*
* @param thread The thread.
diff --git a/cpukit/posix/src/pthreadself.c b/cpukit/posix/src/pthreadself.c
deleted file mode 100644
index db5f2f189d..0000000000
--- a/cpukit/posix/src/pthreadself.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file
- *
- * @ingroup POSIXAPI
- *
- * @brief Function returns the ID of the Calling Thread
- */
-
-/*
- * 16.1.6 Get Calling Thread's ID, p1003.1c/Draft 10, p. 152
- *
- * COPYRIGHT (c) 1989-1999.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pthread.h>
-
-#include <rtems/score/percpu.h>
-#include <rtems/score/thread.h>
-
-pthread_t pthread_self( void )
-{
- return _Thread_Get_executing()->Object.id;
-}
diff --git a/cpukit/rtems/src/taskself.c b/cpukit/rtems/src/taskself.c
deleted file mode 100644
index 193e691ce5..0000000000
--- a/cpukit/rtems/src/taskself.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file
- *
- * @ingroup RTEMSImplClassicTask
- *
- * @brief This source file contains the implementation of
- * rtems_task_self().
- */
-
-/*
- * COPYRIGHT (c) 1989-2007.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/rtems/tasksimpl.h>
-
-rtems_id rtems_task_self(void)
-{
- return _Thread_Get_executing()->Object.id;
-}
diff --git a/cpukit/score/src/threadselfid.c b/cpukit/score/src/threadselfid.c
new file mode 100644
index 0000000000..a8b4315f27
--- /dev/null
+++ b/cpukit/score/src/threadselfid.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSScoreThread
+ *
+ * @brief This source file contains the implementation of _Thread_Self_id().
+ */
+
+/*
+ * Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+ * Copyright (C) 1995 On-Line Applications Research Corporation (OAR)
+ *
+ * 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/threadimpl.h>
+
+#include <pthread.h>
+#include <rtems/rtems/tasks.h>
+
+Objects_Id _Thread_Self_id( void )
+{
+ return _Thread_Get_executing()->Object.id;
+}
+
+RTEMS_ALIAS( _Thread_Self_id ) pthread_t pthread_self( void );
+
+RTEMS_ALIAS( _Thread_Self_id ) rtems_id rtems_task_self( void );
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index a3a9ee42e3..21fa6ea787 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -1119,7 +1119,6 @@ source:
- cpukit/posix/src/pthreadinitthreads.c
- cpukit/posix/src/pthreadjoin.c
- cpukit/posix/src/pthreadonce.c
-- cpukit/posix/src/pthreadself.c
- cpukit/posix/src/pthreadsetaffinitynp.c
- cpukit/posix/src/pthreadsetnamenp.c
- cpukit/posix/src/pthreadsetschedparam.c
@@ -1299,7 +1298,6 @@ source:
- cpukit/rtems/src/taskrestart.c
- cpukit/rtems/src/taskresume.c
- cpukit/rtems/src/tasks.c
-- cpukit/rtems/src/taskself.c
- cpukit/rtems/src/tasksetaffinity.c
- cpukit/rtems/src/tasksetpriority.c
- cpukit/rtems/src/tasksetscheduler.c
@@ -1548,6 +1546,7 @@ source:
- cpukit/score/src/threadqtimeout.c
- cpukit/score/src/threadrestart.c
- cpukit/score/src/threadscheduler.c
+- cpukit/score/src/threadselfid.c
- cpukit/score/src/threadsetstate.c
- cpukit/score/src/threadstackallocate.c
- cpukit/score/src/threadstackfree.c