Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > SSR_impls > SSR__MC_shared_impl

changeset 69:8882e795016d Holistic_Model

find changesets by author, revision, files, or words in the commit message
minor bug fix and name change
author Some Random Person <seanhalle@yahoo.com>
date Sat, 17 Mar 2012 00:42:11 -0700
parents 81a0f076b12e
children eadb2ba022a0
files SSR.c SSR.h SSR_PluginFns.c
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/SSR.c	Fri Mar 16 23:47:37 2012 -0700
     1.2 +++ b/SSR.c	Sat Mar 17 00:42:11 2012 -0700
     1.3 @@ -117,7 +117,7 @@
     1.4  int32
     1.5  SSR__giveIdealNumWorkUnits()
     1.6   {
     1.7 -   return NUM_SCHED_SLOTS * NUM_CORES;
     1.8 +   return NUM_ANIM_SLOTS * NUM_CORES;
     1.9   }
    1.10  
    1.11  int32
    1.12 @@ -201,7 +201,7 @@
    1.13     #endif
    1.14     semanticEnv->shutdownInitiated = FALSE;
    1.15     for(i=0;i<NUM_CORES;++i){
    1.16 -       for(j=0;j<NUM_SCHED_SLOTS;++j){
    1.17 +       for(j=0;j<NUM_ANIM_SLOTS;++j){
    1.18             semanticEnv->idlePr[i][j] = VMS_int__create_slaveVP(&idle_fn,NULL);
    1.19             semanticEnv->idlePr[i][j]->coreAnimatedBy = i;
    1.20         }
    1.21 @@ -215,7 +215,7 @@
    1.22     semanticEnv->ntonGroupsInfo = makePrivDynArrayOfSize((void***)&(semanticEnv->ntonGroups),8);
    1.23     
    1.24     semanticEnv->hwArcs = makeListOfArrays(sizeof(Dependency),128);
    1.25 -   memset(semanticEnv->last_in_slot,0,sizeof(NUM_CORES * NUM_SCHED_SLOTS * sizeof(Unit)));
    1.26 +   memset(semanticEnv->last_in_slot,0,sizeof(NUM_CORES * NUM_ANIM_SLOTS * sizeof(Unit)));
    1.27     #endif
    1.28  
    1.29        //create the ready queue, hash tables used for pairing send to receive

     2.1 --- a/SSR.h	Fri Mar 16 23:47:37 2012 -0700
     2.2 +++ b/SSR.h	Sat Mar 17 00:42:11 2012 -0700
     2.3 @@ -119,14 +119,14 @@
     2.4     NtoN** ntonGroups;
     2.5     PrivDynArrayInfo* ntonGroupsInfo;
     2.6     ListOfArrays* dynDependenciesList;
     2.7 -   Unit last_in_slot[NUM_CORES * NUM_SCHED_SLOTS];
     2.8 +   Unit last_in_slot[NUM_CORES * NUM_ANIM_SLOTS];
     2.9     ListOfArrays* hwArcs;
    2.10     #endif
    2.11  
    2.12     #ifdef HOLISTIC__TURN_ON_PERF_COUNTERS
    2.13     ListOfArrays* counterList[NUM_CORES];
    2.14     #endif
    2.15 -   SlaveVP* idlePr[NUM_CORES][NUM_SCHED_SLOTS];
    2.16 +   SlaveVP* idlePr[NUM_CORES][NUM_ANIM_SLOTS];
    2.17     int shutdownInitiated;
    2.18   }
    2.19  SSRSemEnv;

     3.1 --- a/SSR_PluginFns.c	Fri Mar 16 23:47:37 2012 -0700
     3.2 +++ b/SSR_PluginFns.c	Sat Mar 17 00:42:11 2012 -0700
     3.3 @@ -50,7 +50,7 @@
     3.4         assignPr = semEnv->idlePr[coreNum][slotNum];
     3.5        
     3.6        if(semEnv->shutdownInitiated) {
     3.7 -          schedPr = VMS_SS__create_shutdown_slave();
     3.8 +          assignPr = VMS_SS__create_shutdown_slave();
     3.9        }
    3.10       //things that would normally happen in resume(), but these VPs never go there
    3.11       #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    3.12 @@ -73,7 +73,7 @@
    3.13     #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC
    3.14     if (assignPr) {
    3.15          //assignPr->numTimesAssigned++;
    3.16 -        Unit prev_in_slot = semEnv->last_in_slot[coreNum * NUM_SCHED_SLOTS + slotNum];
    3.17 +        Unit prev_in_slot = semEnv->last_in_slot[coreNum * NUM_ANIM_SLOTS + slotNum];
    3.18          if(prev_in_slot.vp != 0){
    3.19                  Dependency newd;
    3.20                  newd.from_vp = prev_in_slot.vp;
    3.21 @@ -84,7 +84,7 @@
    3.22          }
    3.23          prev_in_slot.vp = assignPr->slaveID;
    3.24          prev_in_slot.task = assignPr->assignCount;
    3.25 -        semEnv->last_in_slot[coreNum * NUM_SCHED_SLOTS + slotNum] = prev_in_slot;        
    3.26 +        semEnv->last_in_slot[coreNum * NUM_ANIM_SLOTS + slotNum] = prev_in_slot;        
    3.27     }
    3.28     #endif
    3.29     return( assignPr );