diff options
Diffstat (limited to '039wait.cc')
| -rw-r--r-- | 039wait.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/039wait.cc b/039wait.cc index a674ad25..82354a53 100644 --- a/039wait.cc +++ b/039wait.cc @@ -24,7 +24,7 @@ WAITING, :(before "End routine Fields") // only if state == WAITING index_t waiting_on_location; -double old_value_of_waiting_location; +int old_value_of_waiting_location; :(before "End routine Constructor") waiting_on_location = old_value_of_waiting_location = 0; @@ -39,9 +39,9 @@ case WAIT_FOR_LOCATION: { reagent loc = canonize(current_instruction().ingredients.at(0)); Current_routine->state = WAITING; Current_routine->waiting_on_location = loc.value; - Current_routine->old_value_of_waiting_location = value(Memory[loc.value]); - trace("run") << "waiting for location " << loc.value << " to change from " << value(Memory[loc.value]); -//? trace("schedule") << Current_routine->id << ": waiting for location " << loc.value << " to change from " << value(Memory[loc.value]); //? 2 + Current_routine->old_value_of_waiting_location = Memory[loc.value]; + trace("run") << "waiting for location " << loc.value << " to change from " << Memory[loc.value]; +//? trace("schedule") << Current_routine->id << ": waiting for location " << loc.value << " to change from " << Memory[loc.value]; //? 2 break; } @@ -54,9 +54,9 @@ for (index_t i = 0; i < Routines.size(); ++i) { //? trace("schedule") << "waiting on location: " << Routines.at(i)->waiting_on_location; //? 1 //? if (Routines.at(i)->waiting_on_location) //? 2 //? trace("schedule") << "checking routine " << Routines.at(i)->id << " waiting on location " //? 2 -//? << Routines.at(i)->waiting_on_location << ": " << value(Memory[Routines.at(i)->waiting_on_location]) << " vs " << Routines.at(i)->old_value_of_waiting_location; //? 2 +//? << Routines.at(i)->waiting_on_location << ": " << Memory[Routines.at(i)->waiting_on_location] << " vs " << Routines.at(i)->old_value_of_waiting_location; //? 2 if (Routines.at(i)->waiting_on_location && - value(Memory[Routines.at(i)->waiting_on_location]) != Routines.at(i)->old_value_of_waiting_location) { + Memory[Routines.at(i)->waiting_on_location] != Routines.at(i)->old_value_of_waiting_location) { trace("schedule") << "waking up routine\n"; Routines.at(i)->state = RUNNING; Routines.at(i)->waiting_on_location = Routines.at(i)->old_value_of_waiting_location = 0; |