changeset 71:69a1875af605 Holistic_Model

counters work now
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Wed, 21 Mar 2012 11:12:08 +0100
parents eadb2ba022a0
children d20b105981b7
files SSR_PluginFns.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/SSR_PluginFns.c	Mon Mar 19 10:02:54 2012 -0700
     1.2 +++ b/SSR_PluginFns.c	Wed Mar 21 11:12:08 2012 +0100
     1.3 @@ -54,6 +54,7 @@
     1.4        }
     1.5       //things that would normally happen in resume(), but these VPs never go there
     1.6       #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
     1.7 +      else{
     1.8          assignPr->assignCount++; //Somewhere here!
     1.9          Unit newu;
    1.10          newu.vp = assignPr->slaveID;
    1.11 @@ -68,10 +69,11 @@
    1.12                  newd.to_task = assignPr->assignCount;
    1.13                  addToListOfArrays(Dependency, newd ,semEnv->ctlDependenciesList);  
    1.14          }
    1.15 +      }
    1.16        #endif
    1.17     }
    1.18     #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    1.19 -   if (assignPr) {
    1.20 +   if (assignPr && assignPr->typeOfVP == Slave) {
    1.21          //assignPr->numTimesAssigned++;
    1.22          Unit prev_in_slot = semEnv->last_in_slot[coreNum * NUM_ANIM_SLOTS + slotNum];
    1.23          if(prev_in_slot.vp != 0){