From 94f4f116e695ad4f5d2c2e50412bcb7b639e5ee7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 21 Jun 2010 21:09:36 +0000 Subject: 2010-06-21 Joel Sherrill * malloc02/init.c, malloc02/malloc02.doc: Enable malloc dirty helper. --- testsuites/libtests/ChangeLog | 4 ++++ testsuites/libtests/malloc02/init.c | 18 +++++------------- testsuites/libtests/malloc02/malloc02.doc | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) (limited to 'testsuites/libtests') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index 8f53539d46..bc05468c42 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,7 @@ +2010-06-21 Joel Sherrill + + * malloc02/init.c, malloc02/malloc02.doc: Enable malloc dirty helper. + 2010-06-21 Joel Sherrill * Makefile.am, configure.ac: Add test for deferring free() from ISR and diff --git a/testsuites/libtests/malloc02/init.c b/testsuites/libtests/malloc02/init.c index 939fdcd748..7a00cb9082 100644 --- a/testsuites/libtests/malloc02/init.c +++ b/testsuites/libtests/malloc02/init.c @@ -53,19 +53,10 @@ rtems_task Init( 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 + /* delay to let timer fire */ 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 + directive_failed( status, "timer_wake_after failed" ); + if ( !operation_performed_from_tsr ) { puts( "Operation from ISR did not get processed\n" ); rtems_test_exit( 0 ); @@ -84,8 +75,9 @@ rtems_task Init( #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_MALLOC_DIRTY +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MAXIMUM_TASKS 1 #define CONFIGURE_MAXIMUM_TIMERS 1 diff --git a/testsuites/libtests/malloc02/malloc02.doc b/testsuites/libtests/malloc02/malloc02.doc index 35ce0d340b..10ea45a0b4 100644 --- a/testsuites/libtests/malloc02/malloc02.doc +++ b/testsuites/libtests/malloc02/malloc02.doc @@ -22,3 +22,4 @@ concepts: + adding to the deferred free operation chain + processing the deferred free operation chain ++ enable the malloc dirty option -- cgit v1.2.3