diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-03-04 15:54:12 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-03-07 13:21:11 -0600 |
| commit | e6c87f78724743bc74a38678f93ed579ace840f2 (patch) | |
| tree | dce3962edb00574dade0c8caf837cd85b9607831 /testsuites/psxtests/psxkey05 | |
| parent | Remove trailing whitespace in previous patches (diff) | |
| download | rtems-e6c87f78724743bc74a38678f93ed579ace840f2.tar.bz2 | |
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.
Diffstat (limited to 'testsuites/psxtests/psxkey05')
| -rw-r--r-- | testsuites/psxtests/psxkey05/init.c | 15 | ||||
| -rw-r--r-- | testsuites/psxtests/psxkey05/psxkey05.scn | 7 |
2 files changed, 12 insertions, 10 deletions
diff --git a/testsuites/psxtests/psxkey05/init.c b/testsuites/psxtests/psxkey05/init.c index 08d22b0cbd..155a9f5807 100644 --- a/testsuites/psxtests/psxkey05/init.c +++ b/testsuites/psxtests/psxkey05/init.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2012 Zhongwei Yao. - * 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 key1, key2; int sc, *value; @@ -69,12 +67,13 @@ void *POSIX_Init( /* configuration information */ #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_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 2 -#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/psxtests/psxkey05/psxkey05.scn b/testsuites/psxtests/psxkey05/psxkey05.scn index f352a36785..89127af466 100644 --- a/testsuites/psxtests/psxkey05/psxkey05.scn +++ b/testsuites/psxtests/psxkey05/psxkey05.scn @@ -1,10 +1,13 @@ +sparc-rtems4.11-run is /home/joel/rtems-4.11-work/tools/bin/sparc-rtems4.11-run + + *** TEST KEY 05 *** Init - pthread key1 create - OK Init - pthread key2 create - OK Init - key1 pthread_setspecific - OK -Init - key1 pthread_getspecific - OK Init - key2 pthread_setspecific - OK +Init - key1 pthread_getspecific - OK Init - key2 pthread_getspecific - OK Init - pthread key1 delete - OK Init - pthread key2 delete - OK -*** END OF TEST KEY 05 ***
\ No newline at end of file +*** END OF TEST KEY 05 *** |