diff MasterLoop.c @ 182:7523ee70d66c

merge changes from default
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Fri, 06 Jan 2012 18:55:05 +0100
parents 3bd35fc83c61 c1784868dcea
children 50b29548d4f0
line diff
     1.1 --- a/MasterLoop.c	Wed Jan 04 16:40:10 2012 +0100
     1.2 +++ b/MasterLoop.c	Fri Jan 06 18:55:05 2012 +0100
     1.3 @@ -90,8 +90,6 @@
     1.4     volatileMasterPr = animatingPr;
     1.5     masterPr         = (VirtProcr*)volatileMasterPr; //used to force re-define after jmp
     1.6  
     1.7 -   bulb b = new_bulb();
     1.8 -   numSlotsFilled=1;
     1.9        //First animation of each MasterVP will in turn animate this part
    1.10        // of setup code.. (VP creator sets up the stack as if this function
    1.11        // was called normally, but actually get here by jmp)
    1.12 @@ -131,9 +129,6 @@
    1.13     slaveScheduler   = masterEnv->slaveScheduler;
    1.14     semanticEnv      = masterEnv->semanticEnv;
    1.15  
    1.16 -   #ifdef DETECT_LOOP_GRAPH
    1.17 -
    1.18 -   #endif
    1.19  
    1.20        //Poll each slot's Done flag
    1.21     numSlotsFilled = 0;
    1.22 @@ -221,9 +216,7 @@
    1.23                 lastRecord->start_assign_instrs = tmp_instrs;
    1.24                 saveCyclesAndInstrs(thisCoresIdx,lastRecord->end_assign_cycles,lastRecord->end_assign_instrs);
    1.25                 #endif
    1.26 -               #ifdef DETECT_LOOP_GRAPH
    1.27  
    1.28 -               #endif
    1.29              writeVMSQ( schedVirtPr, readyToAnimateQ );
    1.30            }
    1.31         }