2009-07-30 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am, configure.ac: Add new test to account for properly
	handling keys when a thread has non-NULL key value and key has NULL
	destructor and when a thread has NULL key value and key has
	destructor.
	* psxkey03/.cvsignore, psxkey03/Makefile.am, psxkey03/init.c,
	psxkey03/psxkey03.doc, psxkey03/psxkey03.scn: New files.

8 files changed, 192 insertions, 2 deletions

diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index 8160ece423..5036b74840 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,5 +1,14 @@
 2009-07-30	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* Makefile.am, configure.ac: Add new test to account for properly
+	handling keys when a thread has non-NULL key value and key has NULL
+	destructor and when a thread has NULL key value and key has
+	destructor.
+	* psxkey03/.cvsignore, psxkey03/Makefile.am, psxkey03/init.c,
+	psxkey03/psxkey03.doc, psxkey03/psxkey03.scn: New files.
+
+2009-07-30	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* Makefile.am, configure.ac: Add new test for exercising running out of
 	memory while allocating the key pointers.
 	* psxkey02/.cvsignore, psxkey02/Makefile.am, psxkey02/init.c,
diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 1a3dbba0aa..7012f85032 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -6,8 +6,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 
 SUBDIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
     psx10 psx11 psx12 psx13 psx14 psxautoinit01 psxautoinit02 psxbarrier01 \
-    psxcancel psxcleanup psxcond01 psxenosys psxkey01 psxkey02 psxitimer \
-    psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 psxmutexattr01 psxobj01 \
+    psxcancel psxcleanup psxcond01 psxenosys psxkey01 psxkey02 psxkey03 \
+    psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 psxmutexattr01 psxobj01 \
     psxrwlock01 psxsem01 psxsignal01 psxsignal02 psxsignal03 psxspin01 \
     psxspin02 psxsysconf psxtime psxtimer01 psxtimer02 psxualarm \
     psxfatal01 psxfatal02 \
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 4b96df2a44..cd0f3b3092 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -56,6 +56,7 @@ psxintrcritical01/Makefile
 psxitimer/Makefile
 psxkey01/Makefile
 psxkey02/Makefile
+psxkey03/Makefile
 psxmount/Makefile
 psxmsgq01/Makefile
 psxmsgq02/Makefile
diff --git a/testsuites/psxtests/psxkey03/.cvsignore b/testsuites/psxtests/psxkey03/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtests/psxkey03/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtests/psxkey03/Makefile.am b/testsuites/psxtests/psxkey03/Makefile.am
new file mode 100644
index 0000000000..6394317e17
--- /dev/null
+++ b/testsuites/psxtests/psxkey03/Makefile.am
@@ -0,0 +1,29 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxkey03
+psxkey03_SOURCES = init.c
+
+dist_rtems_tests_DATA = psxkey03.scn
+dist_rtems_tests_DATA += psxkey03.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+psxkey03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(psxkey03_OBJECTS) $(psxkey03_LDADD)
+LINK_LIBS = $(psxkey03_LDLIBS)
+
+psxkey03$(EXEEXT): $(psxkey03_OBJECTS) $(psxkey03_DEPENDENCIES)
+	@rm -f psxkey03$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey03/init.c b/testsuites/psxtests/psxkey03/init.c
new file mode 100644
index 0000000000..4de2bb353f
--- /dev/null
+++ b/testsuites/psxtests/psxkey03/init.c
@@ -0,0 +1,106 @@
+/*
+ *  COPYRIGHT (c) 1989-2009.
+ *  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.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <pthread.h>
+#include <errno.h>
+#include "tmacros.h"
+#include "pmacros.h"
+
+pthread_key_t Key;
+volatile bool destructor_ran;
+
+void destructor(void *value)
+{
+  destructor_ran = true;
+}
+
+void *Test_Thread(
+  void *key_value
+)
+{
+  int sc;
+
+  puts( "Test_Thread - pthread_setspecific - OK" );
+  sc = pthread_setspecific( Key, key_value );
+  assert( !sc );
+  
+  puts( "Test_Thread - pthread_exit to run key destructors - OK" );
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *ignored
+)
+{
+  pthread_t     thread;
+  int           sc;
+  bool          sb;
+
+  puts( "\n\n*** TEST KEY 03 ***" );
+  
+  /*
+   *  Key with NULL destructor
+   */
+  puts( "Init - pthread_key_create with NULL destructor - OK" );
+  sc = pthread_key_create( &Key, NULL );
+  assert( !sc ); 
+
+  puts( "Init - pthread_create - OK" );
+  sc = pthread_create( &thread, NULL, Test_Thread, &sc );
+  assert( !sc );
+
+  puts( "Init - sleep - let thread run - OK" );
+  usleep(500000);
+
+  puts( "Init - pthread_key_delete - OK" );
+  sc = pthread_key_delete( Key );
+  assert( sc == 0 );
+
+  /*
+   *  Key with non-NULL destructor
+   */
+  destructor_ran = false;
+  puts( "Init - pthread_key_create with non-NULL destructor - OK" );
+  sc = pthread_key_create( &Key, destructor );
+  assert( !sc ); 
+
+  puts( "Init - pthread_create - OK" );
+  sc = pthread_create( &thread, NULL, Test_Thread, NULL );
+  assert( !sc );
+
+  puts( "Init - sleep - let thread run - OK" );
+  usleep(500000);
+
+  puts( "Init - verify destructor did NOT ran" );
+  assert( destructor_ran == false );
+
+  puts( "Init - pthread_key_delete - OK" );
+  sc = pthread_key_delete( Key );
+  assert( sc == 0 );
+
+  puts( "*** END OF TEST KEY 03 ***" );
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS  2
+#define CONFIGURE_MAXIMUM_POSIX_KEYS     1
+
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* global variables */
diff --git a/testsuites/psxtests/psxkey03/psxkey03.doc b/testsuites/psxtests/psxkey03/psxkey03.doc
new file mode 100644
index 0000000000..66501ababa
--- /dev/null
+++ b/testsuites/psxtests/psxkey03/psxkey03.doc
@@ -0,0 +1,28 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2009.
+#  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.com/license/LICENSE.
+#
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  psxkey03
+
+directives:
+
+  pthread_key_create
+  pthread_setspecific
+  pthread_key_delete
+
+concepts:
+
++ Ensure that keys with NULL destructors are properly processed when
+  a thread exits.
+
++ Ensure that keys with destructors but threads with NULL key values are
+  properly processed when the thread exits.
diff --git a/testsuites/psxtests/psxkey03/psxkey03.scn b/testsuites/psxtests/psxkey03/psxkey03.scn
new file mode 100644
index 0000000000..739cd35b2e
--- /dev/null
+++ b/testsuites/psxtests/psxkey03/psxkey03.scn
@@ -0,0 +1,15 @@
+*** TEST KEY 03 ***
+Init - pthread_key_create with NULL destructor - OK
+Init - pthread_create - OK
+Init - sleep - let thread run - OK
+Test_Thread - pthread_setspecific - OK
+Test_Thread - pthread_exit to run key destructors - OK
+Init - pthread_key_delete - OK
+Init - pthread_key_create with non-NULL destructor - OK
+Init - pthread_create - OK
+Init - sleep - let thread run - OK
+Test_Thread - pthread_setspecific - OK
+Test_Thread - pthread_exit to run key destructors - OK
+Init - verify destructor did NOT ran
+Init - pthread_key_delete - OK
+*** END OF TEST KEY 03 ***