# HG changeset patch # User Some Random Person # Date 1331970131 25200 # Node ID 8882e795016d458c8e607f34be446c1eb4a69b88 # Parent 81a0f076b12e41d1296884994995472d04bc2996 minor bug fix and name change diff -r 81a0f076b12e -r 8882e795016d SSR.c --- a/SSR.c Fri Mar 16 23:47:37 2012 -0700 +++ b/SSR.c Sat Mar 17 00:42:11 2012 -0700 @@ -117,7 +117,7 @@ int32 SSR__giveIdealNumWorkUnits() { - return NUM_SCHED_SLOTS * NUM_CORES; + return NUM_ANIM_SLOTS * NUM_CORES; } int32 @@ -201,7 +201,7 @@ #endif semanticEnv->shutdownInitiated = FALSE; for(i=0;iidlePr[i][j] = VMS_int__create_slaveVP(&idle_fn,NULL); semanticEnv->idlePr[i][j]->coreAnimatedBy = i; } @@ -215,7 +215,7 @@ semanticEnv->ntonGroupsInfo = makePrivDynArrayOfSize((void***)&(semanticEnv->ntonGroups),8); semanticEnv->hwArcs = makeListOfArrays(sizeof(Dependency),128); - memset(semanticEnv->last_in_slot,0,sizeof(NUM_CORES * NUM_SCHED_SLOTS * sizeof(Unit))); + memset(semanticEnv->last_in_slot,0,sizeof(NUM_CORES * NUM_ANIM_SLOTS * sizeof(Unit))); #endif //create the ready queue, hash tables used for pairing send to receive diff -r 81a0f076b12e -r 8882e795016d SSR.h --- a/SSR.h Fri Mar 16 23:47:37 2012 -0700 +++ b/SSR.h Sat Mar 17 00:42:11 2012 -0700 @@ -119,14 +119,14 @@ NtoN** ntonGroups; PrivDynArrayInfo* ntonGroupsInfo; ListOfArrays* dynDependenciesList; - Unit last_in_slot[NUM_CORES * NUM_SCHED_SLOTS]; + Unit last_in_slot[NUM_CORES * NUM_ANIM_SLOTS]; ListOfArrays* hwArcs; #endif #ifdef HOLISTIC__TURN_ON_PERF_COUNTERS ListOfArrays* counterList[NUM_CORES]; #endif - SlaveVP* idlePr[NUM_CORES][NUM_SCHED_SLOTS]; + SlaveVP* idlePr[NUM_CORES][NUM_ANIM_SLOTS]; int shutdownInitiated; } SSRSemEnv; diff -r 81a0f076b12e -r 8882e795016d SSR_PluginFns.c --- a/SSR_PluginFns.c Fri Mar 16 23:47:37 2012 -0700 +++ b/SSR_PluginFns.c Sat Mar 17 00:42:11 2012 -0700 @@ -50,7 +50,7 @@ assignPr = semEnv->idlePr[coreNum][slotNum]; if(semEnv->shutdownInitiated) { - schedPr = VMS_SS__create_shutdown_slave(); + assignPr = VMS_SS__create_shutdown_slave(); } //things that would normally happen in resume(), but these VPs never go there #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC @@ -73,7 +73,7 @@ #ifdef HOLISTIC__TURN_ON_OBSERVE_UCC if (assignPr) { //assignPr->numTimesAssigned++; - Unit prev_in_slot = semEnv->last_in_slot[coreNum * NUM_SCHED_SLOTS + slotNum]; + Unit prev_in_slot = semEnv->last_in_slot[coreNum * NUM_ANIM_SLOTS + slotNum]; if(prev_in_slot.vp != 0){ Dependency newd; newd.from_vp = prev_in_slot.vp; @@ -84,7 +84,7 @@ } prev_in_slot.vp = assignPr->slaveID; prev_in_slot.task = assignPr->assignCount; - semEnv->last_in_slot[coreNum * NUM_SCHED_SLOTS + slotNum] = prev_in_slot; + semEnv->last_in_slot[coreNum * NUM_ANIM_SLOTS + slotNum] = prev_in_slot; } #endif return( assignPr );