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.

8 files changed, 46 insertions, 78 deletions

diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index f9eeef2a43..53a588749d 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -15,6 +15,12 @@ include_rtems_posixdir = $(includedir)/rtems/posix
 
 include_rtems_posix_HEADERS = include/rtems/posix/sigset.h
 
+## Some POSIX threads features are needed all the time
+include_rtems_posix_HEADERS += include/rtems/posix/key.h
+include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/config.h
+include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
+
 if HAS_PTHREADS
 # include
 include_HEADERS = include/aio.h
@@ -26,15 +32,11 @@ include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h
 include_rtems_posix_HEADERS += include/rtems/posix/cancel.h
 include_rtems_posix_HEADERS += include/rtems/posix/cond.h
 include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/config.h
-include_rtems_posix_HEADERS += include/rtems/posix/key.h
-include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h
 include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/mutex.h
 include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/onceimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
 include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
@@ -89,11 +91,6 @@ libposix_a_SOURCES += src/cond.c src/condattrdestroy.c \
     src/condinit.c src/condsignal.c src/condsignalsupp.c \
     src/condtimedwait.c src/condwait.c src/condwaitsupp.c src/condget.c
 
-## KEY_C_FILES
-libposix_a_SOURCES += src/key.c src/keycreate.c src/keydelete.c \
-    src/keygetspecific.c src/keyfreememory.c src/keyrundestructors.c \
-    src/keysetspecific.c
-
 ## MEMORY_C_FILES
 libposix_a_SOURCES += src/mprotect.c
 
@@ -158,6 +155,11 @@ libposix_a_SOURCES += src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
     src/pthreadsigmask.c src/sigaction.c
 endif
 
+## KEY_C_FILES
+libposix_a_SOURCES += src/key.c src/keycreate.c src/keydelete.c \
+    src/keygetspecific.c src/keyfreememory.c src/keyrundestructors.c \
+    src/keysetspecific.c
+
 libposix_a_SOURCES += src/sigaddset.c src/sigdelset.c src/sigfillset.c \
    src/sigemptyset.c src/sigismember.c
 
diff --git a/cpukit/posix/include/rtems/posix/config.h b/cpukit/posix/include/rtems/posix/config.h
index 83bd1def58..58dfb59237 100644
--- a/cpukit/posix/include/rtems/posix/config.h
+++ b/cpukit/posix/include/rtems/posix/config.h
@@ -8,7 +8,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2013.
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -76,22 +76,6 @@ typedef struct {
 
   /**
    * This field contains the maximum number of POSIX API
-   * keys which are configured for this application.
-   */
-  uint32_t                            maximum_keys;
-
-  /**
-   * This field contains the maximum number of POSIX API
-   * key value pairs which are configured for this application.
-   *
-   * @note There can be potentially be a key/value pair for
-   *       every thread to use every key. But normally this
-   *       many are not needed in a system.
-   */
-  uint32_t                            maximum_key_value_pairs;
-
-  /**
-   * This field contains the maximum number of POSIX API
    * timers which are configured for this application.
    */
   uint32_t                            maximum_timers;
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
index 6bb3b844cc..f5d57ebe23 100644
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ b/cpukit/posix/include/rtems/posix/threadsup.h
@@ -7,7 +7,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2011.
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -90,15 +90,6 @@ typedef struct {
   struct _pthread_cleanup_context *last_cleanup_context;
 #endif /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */
 
-  /**
-   * This is the thread key value chain's control, which is used
-   * to track all key value for specific thread, and when thread
-   * exits, we can remove all key value for specific thread by
-   * iterating this chain, or we have to search a whole rbtree,
-   * which is inefficient.
-   */
-  Chain_Control           Key_Chain;
-
 } POSIX_API_Control;
 
 /**
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
index d0e238cd15..d8ca9cdf26 100644
--- a/cpukit/posix/preinstall.am
+++ b/cpukit/posix/preinstall.am
@@ -27,6 +27,22 @@ $(PROJECT_INCLUDE)/rtems/posix/sigset.h: include/rtems/posix/sigset.h $(PROJECT_
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/sigset.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/sigset.h
 
+$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.h
+
+$(PROJECT_INCLUDE)/rtems/posix/keyimpl.h: include/rtems/posix/keyimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
+
+$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/config.h
+
+$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
+
 if HAS_PTHREADS
 $(PROJECT_INCLUDE)/aio.h: include/aio.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/aio.h
@@ -56,18 +72,6 @@ $(PROJECT_INCLUDE)/rtems/posix/condimpl.h: include/rtems/posix/condimpl.h $(PROJ
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
 
-$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/config.h
-
-$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.h
-
-$(PROJECT_INCLUDE)/rtems/posix/keyimpl.h: include/rtems/posix/keyimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-
 $(PROJECT_INCLUDE)/rtems/posix/mqueue.h: include/rtems/posix/mqueue.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
@@ -88,10 +92,6 @@ $(PROJECT_INCLUDE)/rtems/posix/onceimpl.h: include/rtems/posix/onceimpl.h $(PROJ
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/onceimpl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/onceimpl.h
 
-$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-
 $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
diff --git a/cpukit/posix/src/key.c b/cpukit/posix/src/key.c
index 2b32b50bcf..41bb946521 100644
--- a/cpukit/posix/src/key.c
+++ b/cpukit/posix/src/key.c
@@ -7,7 +7,7 @@
 
 /*
  * Copyright (c) 2012 Zhongwei Yao.
- * COPYRIGHT (c) 1989-2008.
+ * COPYRIGHT (c) 1989-2014.
  * On-Line Applications Research Corporation (OAR).
  *
  * The license and distribution terms for this file may be
@@ -19,8 +19,9 @@
 #include "config.h"
 #endif
 
+#include <rtems/config.h>
+
 #include <rtems/posix/keyimpl.h>
-#include <rtems/posix/config.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/objectimpl.h>
 #include <rtems/score/wkspace.h>
@@ -72,7 +73,7 @@ int _POSIX_Keys_Key_value_lookup_tree_compare_function(
 
 static uint32_t _POSIX_Keys_Get_keypool_bump_count( void )
 {
-  uint32_t max = Configuration_POSIX_API.maximum_key_value_pairs;
+  uint32_t max = Configuration.maximum_key_value_pairs;
 
   return _Objects_Is_unlimited( max ) ?
     _Objects_Maximum_per_allocation( max ) : 0;
@@ -80,7 +81,7 @@ static uint32_t _POSIX_Keys_Get_keypool_bump_count( void )
 
 static uint32_t _POSIX_Keys_Get_initial_keypool_size( void )
 {
-  uint32_t max = Configuration_POSIX_API.maximum_key_value_pairs;
+  uint32_t max = Configuration.maximum_key_value_pairs;
 
   return _Objects_Maximum_per_allocation( max );
 }
@@ -135,7 +136,7 @@ void _POSIX_Key_Manager_initialization(void)
     &_POSIX_Keys_Information,   /* object information table */
     OBJECTS_POSIX_API,          /* object API */
     OBJECTS_POSIX_KEYS,         /* object class */
-    Configuration_POSIX_API.maximum_keys,
+    Configuration.maximum_keys,
                                 /* maximum objects of this class */
     sizeof( POSIX_Keys_Control ),
                                 /* size of this object's control block */
diff --git a/cpukit/posix/src/keyrundestructors.c b/cpukit/posix/src/keyrundestructors.c
index 2545486940..312cf35e68 100644
--- a/cpukit/posix/src/keyrundestructors.c
+++ b/cpukit/posix/src/keyrundestructors.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2012 Zhongwei Yao.
  * Copyright (c) 2010 embedded brains GmbH.
  *
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2014.
  * On-Line Applications Research Corporation (OAR).
  *
  * The license and distribution terms for this file may be
@@ -22,8 +22,8 @@
 #endif
 
 #include <rtems/posix/keyimpl.h>
-#include <rtems/posix/threadsup.h>
 #include <rtems/score/chainimpl.h>
+#include <rtems/score/thread.h>
 
 /*
  *  _POSIX_Keys_Run_destructors
@@ -46,9 +46,7 @@ void _POSIX_Keys_Run_destructors(
 
   _Thread_Disable_dispatch();
 
-  chain = &(
-      (POSIX_API_Control *)thread->API_Extensions[ THREAD_API_POSIX ]
-  )->Key_Chain;
+  chain = &thread->Key_Chain;
   iter = (POSIX_Keys_Key_value_pair *) _Chain_First( chain );
   while ( !_Chain_Is_tail( chain, &iter->Key_values_per_thread_node ) ) {
     next = (POSIX_Keys_Key_value_pair *)
diff --git a/cpukit/posix/src/keysetspecific.c b/cpukit/posix/src/keysetspecific.c
index 5cfa90e4e7..c6e2d30151 100644
--- a/cpukit/posix/src/keysetspecific.c
+++ b/cpukit/posix/src/keysetspecific.c
@@ -7,7 +7,7 @@
 
 /*
  * Copyright (c) 2012 Zhongwei Yao.
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2014.
  * On-Line Applications Research Corporation (OAR).
  *
  * The license and distribution terms for this file may be
@@ -20,7 +20,7 @@
 #endif
 
 #include <rtems/posix/keyimpl.h>
-#include <rtems/posix/threadsup.h>
+#include <rtems/score/thread.h>
 #include <rtems/score/chainimpl.h>
 
 #include <errno.h>
@@ -37,7 +37,6 @@ int pthread_setspecific(
   POSIX_Keys_Control          *the_key;
   Objects_Locations            location;
   POSIX_Keys_Key_value_pair   *value_pair_ptr;
-  POSIX_API_Control           *api;
 
   the_key = _POSIX_Keys_Get( key, &location );
   switch ( location ) {
@@ -55,7 +54,7 @@ int pthread_setspecific(
       value_pair_ptr->thread_id = _Thread_Executing->Object.id;
       value_pair_ptr->value = value;
       if ( _RBTree_Insert( &_POSIX_Keys_Key_value_lookup_tree,
-                                       &(value_pair_ptr->Key_value_lookup_node) ) ) {
+                           &(value_pair_ptr->Key_value_lookup_node) ) ) {
         _Freechain_Put( (Freechain_Control *)&_POSIX_Keys_Keypool,
                         (void *) value_pair_ptr );
         _Objects_Put( &the_key->Object );
@@ -64,9 +63,10 @@ int pthread_setspecific(
       }
 
       /** append rb_node to the thread API extension's chain */
-      api = (POSIX_API_Control *)\
-       (_Thread_Executing->API_Extensions[THREAD_API_POSIX]);
-      _Chain_Append_unprotected( &api->Key_Chain, &value_pair_ptr->Key_values_per_thread_node );
+      _Chain_Append_unprotected(
+        &_Thread_Executing->Key_Chain,
+        &value_pair_ptr->Key_values_per_thread_node
+      );
 
       _Objects_Put( &the_key->Object );
 
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 67b62ae67e..33577a22ac 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -6,7 +6,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2013.
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -247,9 +247,6 @@ static bool _POSIX_Threads_Create_extension(
     created
   );
 
-  /** initialize thread's key vaule node chain */
-  _Chain_Initialize_empty( &api->Key_Chain );
-
   return true;
 }
 
@@ -275,11 +272,6 @@ static void _POSIX_Threads_Delete_extension(
   _POSIX_Threads_cancel_run( deleted );
 
   /*
-   *  Run all the key destructors
-   */
-  _POSIX_Keys_Run_destructors( deleted );
-
-  /*
    *  Wakeup all the tasks which joined with this one
    */
   value_ptr = (void **) deleted->Wait.return_argument;