From e6c87f78724743bc74a38678f93ed579ace840f2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 4 Mar 2014 15:54:12 -0600 Subject: POSIX keys now enabled in all configurations. Formerly POSIX keys were only enabled when POSIX threads were enabled. Because they are a truly safe alternative to per-task variables in an SMP system, they are being enabled in all configurations. --- testsuites/psxtests/psxkey02/init.c | 12 +++++------- testsuites/psxtests/psxkey02/psxkey02.scn | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'testsuites/psxtests/psxkey02') diff --git a/testsuites/psxtests/psxkey02/init.c b/testsuites/psxtests/psxkey02/init.c index 6055dac828..6fc6a3c7a3 100644 --- a/testsuites/psxtests/psxkey02/init.c +++ b/testsuites/psxtests/psxkey02/init.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-2012. + * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -18,11 +18,9 @@ #include "pmacros.h" /* forward declarations to avoid warnings */ -void *POSIX_Init(void *argument); +rtems_task Init(rtems_task_argument ignored); -void *POSIX_Init( - void *ignored -) +rtems_task Init(rtems_task_argument ignored) { pthread_key_t key; int eno; @@ -84,10 +82,10 @@ void *POSIX_Init( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_POSIX_THREADS 1 +#define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_MAXIMUM_POSIX_KEYS 1 -#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_INIT #include diff --git a/testsuites/psxtests/psxkey02/psxkey02.scn b/testsuites/psxtests/psxkey02/psxkey02.scn index fbc3342a23..f5a5f71f60 100644 --- a/testsuites/psxtests/psxkey02/psxkey02.scn +++ b/testsuites/psxtests/psxkey02/psxkey02.scn @@ -1,6 +1,8 @@ +sparc-rtems4.11-run is /home/joel/rtems-4.11-work/tools/bin/sparc-rtems4.11-run + + *** TEST KEY 02 *** Init - pthread_key_create - ENOMEM Init - pthread_key_delete - OK Init - verify workspace has same memory *** END OF TEST KEY 02 *** - -- cgit v1.2.3