diff AnimationMaster.c @ 238:b95711c6965c

counters work now
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Wed, 21 Mar 2012 11:09:11 +0100
parents d9053472d0db
children 7ed97c961901
line diff
     1.1 --- a/AnimationMaster.c	Mon Mar 19 10:03:45 2012 -0700
     1.2 +++ b/AnimationMaster.c	Wed Mar 21 11:09:11 2012 +0100
     1.3 @@ -130,7 +130,7 @@
     1.4     RequestHandler  requestHandler;
     1.5     void           *semanticEnv;
     1.6     int32           thisCoresIdx;
     1.7 -      
     1.8 +  
     1.9     //======================== Initializations ========================
    1.10     masterEnv        = (MasterEnv*)_VMSMasterEnv;
    1.11     
    1.12 @@ -140,7 +140,8 @@
    1.13     requestHandler   = masterEnv->requestHandler;
    1.14     slaveAssigner    = masterEnv->slaveAssigner;
    1.15     semanticEnv      = masterEnv->semanticEnv;
    1.16 -
    1.17 +   
    1.18 +      HOLISTIC__Insert_Master_Global_Vars;
    1.19     
    1.20     //======================== animationMaster ========================
    1.21     while(1){
    1.22 @@ -158,17 +159,20 @@
    1.23         {
    1.24           currSlot->workIsDone         = FALSE;
    1.25           currSlot->needsSlaveAssigned = TRUE;
    1.26 -
    1.27 +         
    1.28 +       HOLISTIC__Record_AppResponder_start;
    1.29                 MEAS__startReqHdlr;
    1.30                 
    1.31              //process the requests made by the slave (held inside slave struc)
    1.32           (*requestHandler)( currSlot->slaveAssignedToSlot, semanticEnv );
    1.33           
    1.34 +         HOLISTIC__Record_AppResponder_end;
    1.35                 MEAS__endReqHdlr;
    1.36         }
    1.37           //If slot empty, hand to Assigner to fill with a slave
    1.38        if( currSlot->needsSlaveAssigned )
    1.39         {    //Call plugin's Assigner to give slot a new slave
    1.40 +          HOLISTIC__Record_Assigner_start;
    1.41           assignedSlaveVP =
    1.42            (*slaveAssigner)( semanticEnv, currSlot );
    1.43           
    1.44 @@ -178,6 +182,8 @@
    1.45              assignedSlaveVP->animSlotAssignedTo       = currSlot;
    1.46              currSlot->needsSlaveAssigned  = FALSE;
    1.47              numSlotsFilled               += 1;
    1.48 +            
    1.49 +            HOLISTIC__Record_Assigner_end;
    1.50            }
    1.51         }
    1.52      }