changeset 237:ce1f57e10fac Common_Ancestor

bug fix -- initialize coreSlotIsOn -- now works
author Some Random Person <seanhalle@yahoo.com>
date Mon, 19 Mar 2012 10:03:45 -0700
parents d9053472d0db
children b95711c6965c
files VMS.h VMS__startup_and_shutdown.c
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/VMS.h	Sat Mar 17 00:41:34 2012 -0700
     1.2 +++ b/VMS.h	Mon Mar 19 10:03:45 2012 -0700
     1.3 @@ -103,7 +103,7 @@
     1.4     SlaveVP      *slaveAssignedToSlot;
     1.5     
     1.6     int           slotIdx;  //needed by Holistic Model's data gathering
     1.7 -   int           coreOfSlot;
     1.8 +   int           coreSlotIsOn;
     1.9     SlotPerfInfo *perfInfo; //used by assigner to pick best slave for core
    1.10   };
    1.11  //AnimSlot
     2.1 --- a/VMS__startup_and_shutdown.c	Sat Mar 17 00:41:34 2012 -0700
     2.2 +++ b/VMS__startup_and_shutdown.c	Mon Mar 19 10:03:45 2012 -0700
     2.3 @@ -29,7 +29,7 @@
     2.4  
     2.5  //===========================================================================
     2.6  AnimSlot **
     2.7 -create_anim_slots();
     2.8 +create_anim_slots( int32 coreSlotsAreOn );
     2.9  
    2.10  void
    2.11  create_masterEnv();
    2.12 @@ -307,7 +307,7 @@
    2.13        masterVPs[ coreIdx ] = VMS_int__create_slaveVP( (TopLevelFnPtr)&animationMaster, (void*)masterEnv );
    2.14        masterVPs[ coreIdx ]->coreAnimatedBy = coreIdx;
    2.15        masterVPs[ coreIdx ]->typeOfVP = Master;
    2.16 -      allAnimSlots[ coreIdx ] = create_anim_slots(); //makes for one core
    2.17 +      allAnimSlots[ coreIdx ] = create_anim_slots( coreIdx ); //makes for one core
    2.18      }
    2.19     _VMSMasterEnv->masterVPs        = masterVPs;
    2.20     _VMSMasterEnv->masterLock       = UNLOCKED;
    2.21 @@ -331,7 +331,7 @@
    2.22   }
    2.23  
    2.24  AnimSlot **
    2.25 -create_anim_slots()
    2.26 +create_anim_slots( int32 coreSlotsAreOn )
    2.27   { AnimSlot  **animSlots;
    2.28     int i;
    2.29  
    2.30 @@ -345,6 +345,7 @@
    2.31        animSlots[i]->workIsDone         = FALSE;
    2.32        animSlots[i]->needsSlaveAssigned = TRUE;
    2.33        animSlots[i]->slotIdx            = i; //quick retrieval of slot pos
    2.34 +      animSlots[i]->coreSlotIsOn       = coreSlotsAreOn;
    2.35      }
    2.36     return animSlots;
    2.37   }