From 70e27c2d80d0218592c4b8d0a7ff290f061bcc83 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 26 Feb 2004 16:50:24 +0000 Subject: [PATCH] 2004-02-26 Joel Sherrill PR 583/tests * tm26/task1.c, tm27/task1.c: Correctly reset _Thread_Dispatch_disable_level so printing is safe. --- c/src/tests/tmtests/ChangeLog | 6 ++++++ c/src/tests/tmtests/tm26/task1.c | 9 +++++++++ c/src/tests/tmtests/tm27/task1.c | 2 ++ 3 files changed, 17 insertions(+) diff --git a/c/src/tests/tmtests/ChangeLog b/c/src/tests/tmtests/ChangeLog index 3cf60d02b1..0d8a7458f9 100644 --- a/c/src/tests/tmtests/ChangeLog +++ b/c/src/tests/tmtests/ChangeLog @@ -1,3 +1,9 @@ +2004-02-26 Joel Sherrill + + PR 583/tests + * tm26/task1.c, tm27/task1.c: Correctly reset + _Thread_Dispatch_disable_level so printing is safe. + 2003-09-04 Joel Sherrill * include/timesys.h, tm01/system.h, tm01/task1.c, tm01/tm01.doc, diff --git a/c/src/tests/tmtests/tm26/task1.c b/c/src/tests/tmtests/tm26/task1.c index 6db80632f8..299fa67ddc 100644 --- a/c/src/tests/tmtests/tm26/task1.c +++ b/c/src/tests/tmtests/tm26/task1.c @@ -417,6 +417,15 @@ void complete_test( void ) (void) _Thread_Get( 0x3, &location ); thread_get_invalid_time = Read_timer(); + /* + * This is the running task and we have tricked RTEMS out enough where + * we need to set some internal tracking information to match this. + */ + + _Thread_Heir = _Thread_Executing; + _Context_Switch_necessary = FALSE; + _Thread_Dispatch_disable_level = 0; + /* * Now dump all the times */ diff --git a/c/src/tests/tmtests/tm27/task1.c b/c/src/tests/tmtests/tm27/task1.c index 18ea62a162..16b49742c9 100644 --- a/c/src/tests/tmtests/tm27/task1.c +++ b/c/src/tests/tmtests/tm27/task1.c @@ -144,6 +144,8 @@ rtems_task Task_1( #endif Interrupt_return_time = Read_timer(); + _Thread_Dispatch_disable_level = 0; + put_time( "interrupt entry overhead: returns to nested interrupt", Interrupt_enter_nested_time,