summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2004-02-26 16:50:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2004-02-26 16:50:24 +0000
commit70e27c2d80d0218592c4b8d0a7ff290f061bcc83 (patch)
treee0f44fc5ec414cb6c3c2e47a922de43298a98ea8
parent2004-02-26 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-70e27c2d80d0218592c4b8d0a7ff290f061bcc83.tar.bz2
2004-02-26 Joel Sherrill <joel@OARcorp.com>
PR 583/tests * tm26/task1.c, tm27/task1.c: Correctly reset _Thread_Dispatch_disable_level so printing is safe.
-rw-r--r--c/src/tests/tmtests/ChangeLog6
-rw-r--r--c/src/tests/tmtests/tm26/task1.c9
-rw-r--r--c/src/tests/tmtests/tm27/task1.c2
3 files changed, 17 insertions, 0 deletions
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 <joel@OARcorp.com>
+
+ PR 583/tests
+ * tm26/task1.c, tm27/task1.c: Correctly reset
+ _Thread_Dispatch_disable_level so printing is safe.
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* 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
@@ -418,6 +418,15 @@ void complete_test( void )
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,