summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-12 09:26:08 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-13 08:10:28 +0100
commit7c49927911badda7907703568cadbcb2f1b7ef9d (patch)
treef2104a2e9d85422cedc9afef3c16f96394ba3130
parentda6ad56a68676d68782ddcbd443a57337c84ee06 (diff)
downloadrtems-7c49927911badda7907703568cadbcb2f1b7ef9d.tar.bz2
posix: Add pthread_getname_np(), ...
Add pthread_getname_np() and pthread_setname_np(). Update #2858.
-rw-r--r--cpukit/posix/Makefile.am2
-rw-r--r--cpukit/posix/src/pthreadgetnamenp.c44
-rw-r--r--cpukit/posix/src/pthreadsetnamenp.c38
-rw-r--r--testsuites/psxtests/Makefile.am1
-rw-r--r--testsuites/psxtests/configure.ac1
-rw-r--r--testsuites/psxtests/psxthreadname01/Makefile.am19
-rw-r--r--testsuites/psxtests/psxthreadname01/init.c101
-rw-r--r--testsuites/psxtests/psxthreadname01/psxthreadname01.doc12
-rw-r--r--testsuites/psxtests/psxthreadname01/psxthreadname01.scn0
9 files changed, 218 insertions, 0 deletions
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index d9a3437b13..9cc10438da 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -65,6 +65,8 @@ endif
libposix_a_SOURCES += src/fork.c src/vfork.c
libposix_a_SOURCES += src/wait.c src/waitpid.c
+libposix_a_SOURCES += src/pthreadgetnamenp.c
+libposix_a_SOURCES += src/pthreadsetnamenp.c
if HAS_PTHREADS
libposix_a_SOURCES += src/pthreadatfork.c
diff --git a/cpukit/posix/src/pthreadgetnamenp.c b/cpukit/posix/src/pthreadgetnamenp.c
new file mode 100644
index 0000000000..e753823976
--- /dev/null
+++ b/cpukit/posix/src/pthreadgetnamenp.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 embedded brains GmbH.
+ *
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <errno.h>
+#include <string.h>
+
+#include <rtems/score/threadimpl.h>
+
+int pthread_getname_np( pthread_t thread, char *name, size_t len )
+{
+ Thread_Control *the_thread;
+ ISR_lock_Context lock_context;
+ size_t actual_len;
+
+ _Objects_Allocator_lock();
+ the_thread = _Thread_Get( thread, &lock_context );
+
+ if ( the_thread == NULL ) {
+ _Objects_Allocator_unlock();
+ strlcpy(name, "", len);
+ return ESRCH;
+ }
+
+ _ISR_lock_ISR_enable( &lock_context );
+ actual_len = _Thread_Get_name( the_thread, name, len );
+ _Objects_Allocator_unlock();
+
+ if ( actual_len >= len ) {
+ return ERANGE;
+ }
+
+ return 0;
+}
diff --git a/cpukit/posix/src/pthreadsetnamenp.c b/cpukit/posix/src/pthreadsetnamenp.c
new file mode 100644
index 0000000000..cb0e47ce94
--- /dev/null
+++ b/cpukit/posix/src/pthreadsetnamenp.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017 embedded brains GmbH.
+ *
+ * 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.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <errno.h>
+
+#include <rtems/score/threadimpl.h>
+#include <rtems/posix/posixapi.h>
+
+int pthread_setname_np( pthread_t thread, const char *name )
+{
+ Thread_Control *the_thread;
+ ISR_lock_Context lock_context;
+ Status_Control status;
+
+ _Objects_Allocator_lock();
+ the_thread = _Thread_Get( thread, &lock_context );
+
+ if ( the_thread == NULL ) {
+ _Objects_Allocator_unlock();
+ return ESRCH;
+ }
+
+ _ISR_lock_ISR_enable( &lock_context );
+ status = _Thread_Set_name( the_thread, name );
+ _Objects_Allocator_unlock();
+ return _POSIX_Get_error( status );
+}
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 40faa61a4f..e0ce36f719 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I ../aclocal
_SUBDIRS = psxclock
+_SUBDIRS += psxthreadname01
if HAS_POSIX
_SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
psx10 psx11 psx12 psx13 psx14 psx15 psx16 \
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 1ac2877f83..7401258871 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -203,6 +203,7 @@ psxtime/Makefile
psxtimer01/Makefile
psxtimer02/Makefile
psxtimes01/Makefile
+psxthreadname01/Makefile
psxualarm/Makefile
psxusleep/Makefile
])
diff --git a/testsuites/psxtests/psxthreadname01/Makefile.am b/testsuites/psxtests/psxthreadname01/Makefile.am
new file mode 100644
index 0000000000..8726803b48
--- /dev/null
+++ b/testsuites/psxtests/psxthreadname01/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = psxthreadname01
+psxthreadname01_SOURCES = init.c
+
+dist_rtems_tests_DATA = psxthreadname01.scn psxthreadname01.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(psxthreadname01_OBJECTS)
+LINK_LIBS = $(psxthreadname01_LDLIBS)
+
+psxthreadname01$(EXEEXT): $(psxthreadname01_OBJECTS) $(psxthreadname01_DEPENDENCIES)
+ @rm -f psxthreadname01$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxthreadname01/init.c b/testsuites/psxtests/psxthreadname01/init.c
new file mode 100644
index 0000000000..16fdec6958
--- /dev/null
+++ b/testsuites/psxtests/psxthreadname01/init.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2017 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * 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
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <pthread.h>
+#include <string.h>
+
+#include "tmacros.h"
+
+const char rtems_test_name[] = "PSXTHREADNAME 1";
+
+#define MAX_NAME_SIZE 13
+
+static void test(void)
+{
+ static const char no_name[] = "NO";
+ static const char big_name[] = "abcdefghijklmnopqrstuvwxyz";
+ static const char new_name[] = "new";
+ char name[sizeof(big_name)];
+ int eno;
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(0xffffffff, name, MAX_NAME_SIZE);
+ rtems_test_assert(eno == ESRCH);
+ rtems_test_assert(strcmp(name, "") == 0);
+
+ eno = pthread_setname_np(0xffffffff, name);
+ rtems_test_assert(eno == ESRCH);
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(pthread_self(), name, 0);
+ rtems_test_assert(eno == ERANGE);
+ rtems_test_assert(strcmp(name, "NO") == 0);
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(pthread_self(), name, sizeof(name));
+ rtems_test_assert(eno == 0);
+ rtems_test_assert(strcmp(name, "UI1 ") == 0);
+
+ eno = pthread_setname_np(pthread_self(), big_name);
+ rtems_test_assert(eno == ERANGE);
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(pthread_self(), name, sizeof(name));
+ rtems_test_assert(eno == 0);
+ rtems_test_assert(strcmp(name, "abcdefghijkl") == 0);
+
+ eno = pthread_setname_np(pthread_self(), new_name);
+ rtems_test_assert(eno == 0);
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(pthread_self(), name, sizeof(name));
+ rtems_test_assert(eno == 0);
+ rtems_test_assert(strcmp(name, "new") == 0);
+
+ memcpy(name, no_name, sizeof(name));
+ eno = pthread_getname_np(pthread_self(), name, 3);
+ rtems_test_assert(eno == ERANGE);
+ rtems_test_assert(strcmp(name, "ne") == 0);
+}
+
+static void Init(rtems_task_argument arg)
+{
+ TEST_BEGIN();
+
+ test();
+
+ TEST_END();
+ rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS 1
+
+#define CONFIGURE_MAXIMUM_THREAD_NAME_SIZE MAX_NAME_SIZE
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/psxtests/psxthreadname01/psxthreadname01.doc b/testsuites/psxtests/psxthreadname01/psxthreadname01.doc
new file mode 100644
index 0000000000..9094bc0955
--- /dev/null
+++ b/testsuites/psxtests/psxthreadname01/psxthreadname01.doc
@@ -0,0 +1,12 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: psxthreadname01
+
+directives:
+
+ - pthread_setname_np()
+ - pthread_getname_np()
+
+concepts:
+
+ - Ensure that set/get of thread names works as expected.
diff --git a/testsuites/psxtests/psxthreadname01/psxthreadname01.scn b/testsuites/psxtests/psxthreadname01/psxthreadname01.scn
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/testsuites/psxtests/psxthreadname01/psxthreadname01.scn