ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change subsystem-runner test to remove explicit locking entirely

Browse source
This commit is contained in:
Fischlurch 2010-02-07 02:56:30 +01:00
parent c406d16fbc
commit 8ad3bf1736
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/lib/subsystem-runner-test.cpp
View file

@ -42,8 +42,6 @@ using std::tr1::bind;
using util::isnil;
using util::cStr;
using test::Test;
using lib::Sync;
using lib::RecursiveLock_Waitable;
using backend::Thread;
@ -86,7 +84,6 @@ namespace test {
*/
class MockSys
: public lumiera::Subsys
, public Sync<RecursiveLock_Waitable> ////////////TODO: Sync could be eliminated entirely here
{
Literal id_;
const string spec_;
@ -121,7 +118,7 @@ namespace test {
REQUIRE (!started_);
Thread (id_, bind (&MockSys::run, this, termination))
.sync(); // run-status hanshake
.sync(); // run-status handshake
ASSERT (started_);
}
@ -179,9 +176,11 @@ namespace test {
INFO (test, "thread %s now running....", cStr(*this));
Lock sync_condition(this);
while (!sync_condition.wait (*this, &MockSys::tick, TICK_DURATION_ms))
running_duration_ -= TICK_DURATION_ms;
while (!shouldTerminate())
{
usleep (1000*TICK_DURATION_ms);
running_duration_ -= TICK_DURATION_ms;
}
INFO (test, "thread %s about to terminate...", cStr(*this));
isUp_ = false;
@ -203,7 +202,7 @@ namespace test {
bool
tick () ///< simulates async termination, either on request or by timing
shouldTerminate () ///< simulates async termination, either on request or by timing
{
return termRequest_ || running_duration_ <= 0;
}
@ -263,11 +262,11 @@ namespace test {
run (Arg)
{
singleSubsys_complete_cycle();
singleSubsys_start_failure();
//singleSubsys_emegency_exit();
singleSubsys_start_failure(); ////////////////////////////TODO: Valgrind logs an invalid read from here here, at line 172
singleSubsys_emegency_exit();
//dependentSubsys_complete_cycle();
//dependentSubsys_start_failure();
dependentSubsys_complete_cycle();
dependentSubsys_start_failure();
}