2010-06-21 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac: Add test for deferring free() from ISR and
	for deferred free() processing.
	* malloc02/.cvsignore, malloc02/Makefile.am, malloc02/init.c,
	malloc02/malloc02.doc, malloc02/malloc02.scn: New files.

5 files changed, 152 insertions, 0 deletions

diff --git a/testsuites/libtests/malloc02/.cvsignore b/testsuites/libtests/malloc02/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/libtests/malloc02/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/libtests/malloc02/Makefile.am b/testsuites/libtests/malloc02/Makefile.am
new file mode 100644
index 0000000000..dcfacc697c
--- /dev/null
+++ b/testsuites/libtests/malloc02/Makefile.am
@@ -0,0 +1,26 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = malloc02
+malloc02_SOURCES = init.c ../../support/src/spin.c
+
+dist_rtems_tests_DATA = malloc02.scn
+dist_rtems_tests_DATA += malloc02.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 = $(malloc02_OBJECTS) $(malloc02_LDADD)
+LINK_LIBS = $(malloc02_LDLIBS)
+
+malloc02$(EXEEXT): $(malloc02_OBJECTS) $(malloc02_DEPENDENCIES)
+	@rm -f malloc02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c
new file mode 100644
index 0000000000..939fdcd748
--- /dev/null
+++ b/testsuites/libtests/malloc02/init.c
@@ -0,0 +1,95 @@
+/*
+ *  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 <tmacros.h>
+
+volatile bool operation_performed_from_tsr;
+
+void *Pointer1;
+
+rtems_timer_service_routine test_operation_from_isr(
+  rtems_id  timer,
+  void     *arg
+)
+{
+  /* free memory from ISR so it is deferred */
+  free( Pointer1 );
+
+  operation_performed_from_tsr = true;
+}
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_status_code     status;
+  rtems_id              timer;
+  void                 *pointer2;
+
+  puts( "\n\n*** TEST MALLOC 02 ***" );
+
+  puts( "malloc memory to free from ISR" );
+  Pointer1 = malloc( 20 );
+
+  /*
+   *  Timer used in multiple ways
+   */
+  status = rtems_timer_create( rtems_build_name('T', 'M', 'R', '0'), &timer );
+  directive_failed( status, "rtems_timer_create" );
+
+  operation_performed_from_tsr = false;
+
+  /*
+   * Test Operation from ISR
+   */
+  status = rtems_timer_fire_after( timer, 10, test_operation_from_isr, NULL );
+  directive_failed( status, "timer_fire_after failed" );
+
+  /* XXX pick a delay method */
+#if 0
+  status = rtems_task_wake_after( 20 );
+#else
+  {
+    rtems_interval        start;
+    rtems_interval        now;
+    start = rtems_clock_get_ticks_since_boot();
+    do {
+      now = rtems_clock_get_ticks_since_boot();
+    } while ( (now-start) < 100 );
+  }
+#endif
+  if ( !operation_performed_from_tsr ) {
+    puts( "Operation from ISR did not get processed\n" );
+    rtems_test_exit( 0 );
+  }
+
+  puts( "Free from ISR successfully processed" );
+  puts( "Now malloc'ing more memory to process the free" );
+  pointer2 = malloc(20);
+
+  puts( "*** END OF TEST MALLOC 02 ***" );
+  rtems_test_exit( 0 );
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_MAXIMUM_TIMERS            1
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+/* end of file */
+
diff --git a/testsuites/libtests/malloc02/malloc02.doc b/testsuites/libtests/malloc02/malloc02.doc
new file mode 100644
index 0000000000..35ce0d340b
--- /dev/null
+++ b/testsuites/libtests/malloc02/malloc02.doc
@@ -0,0 +1,24 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2010.
+#  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:  malloc02
+
+directives:
+
+  + free from ISR which is deferred
+  + malloc - deferred reclamation
+
+concepts:
+
++ adding to the deferred free operation chain
++ processing the deferred free operation chain
diff --git a/testsuites/libtests/malloc02/malloc02.scn b/testsuites/libtests/malloc02/malloc02.scn
new file mode 100644
index 0000000000..fa8636337b
--- /dev/null
+++ b/testsuites/libtests/malloc02/malloc02.scn
@@ -0,0 +1,5 @@
+*** TEST MALLOC 02 ***
+malloc memory to free from ISR
+Free from ISR successfully processed
+Now malloc'ing more memory to process the free
+*** END OF TEST MALLOC 02 ***