diff --git a/assignment2_handout.c b/assignment2_handout.c index 221bc13..0519f6b 100644 --- a/assignment2_handout.c +++ b/assignment2_handout.c @@ -131,8 +131,8 @@ void get_into_lift(lift_info *lift, int direction) { // Wait for person to get into lift Sleep(GETINSPEED); - // Set lift to enter - // Signal passenger to enter +--- // Set lift to enter +--- // Signal passenger to enter } else { break; } @@ -166,7 +166,7 @@ void* lift_thread(void *p) { Sleep(rnd(1000)); // Loop forever - while(TRUE) { + while(1 == 1) { // Print current position of the lift print_at_xy(no*4+1, NFLOORS-lift.position, lf); @@ -183,7 +183,8 @@ void* lift_thread(void *p) { // Wait for exit lift delay Sleep(GETOUTSPEED); - // Signal passenger to leave lift + +--- // Signal passenger to leave lift // Check if that was the last passenger waiting for this floor if(!lift.stops[lift.position]) { @@ -246,7 +247,7 @@ void* person_thread(void *p) { // Print person waiting print_at_xy(NLIFTS*4+ floors[from].waitingtogoup +floors[from].waitingtogodown,NFLOORS-from, pr); - // Wait for a lift to arrive (going up) +--- // Wait for a lift to arrive (going up) } else { // One more person waiting to go down floors[from].waitingtogodown++; @@ -254,11 +255,11 @@ void* person_thread(void *p) { // Print person waiting print_at_xy(NLIFTS*4+floors[from].waitingtogodown+floors[from].waitingtogoup,NFLOORS-from, pr); - // Wait for a lift to arrive (going down) +--- // Wait for a lift to arrive (going down) } // Which lift we are getting into - lift = 0; +--- lift = ; // Add one to passengers waiting for floor lift->stops[to]++; @@ -269,7 +270,7 @@ void* person_thread(void *p) { print_at_xy(lift->no*4+1+2, NFLOORS-to, "-"); } - // Wait until we are at the right floor +--- // Wait until we are at the right floor // Exit the lift from = to;