diff PR.h @ 266:a5fa1e087c7e

Save checkpoint to come back to -- about to mangle AnimationMaster.c
author Sean Halle <seanhalle@yahoo.com>
date Thu, 25 Oct 2012 23:35:36 -0700
parents dafae55597ce
children 608833ae2c5d
line diff
     1.1 --- a/PR.h	Tue Oct 23 23:46:17 2012 -0700
     1.2 +++ b/PR.h	Thu Oct 25 23:35:36 2012 -0700
     1.3 @@ -131,8 +131,8 @@
     1.4  //AnimSlot
     1.5  
     1.6  enum VPtype 
     1.7 - { TaskSlotSlv = 1,//Slave tied to an anim slot, only animates tasks
     1.8 -   TaskFreeSlv,   //When a suspended task ends, the slave becomes this
     1.9 + { SlotTaskSlv = 1,//Slave tied to an anim slot, only animates tasks
    1.10 +   FreeTaskSlv,   //When a suspended task ends, the slave becomes this
    1.11     GenericSlv,     //the VP is explicitly seen in the app code, or task suspends
    1.12     Master,
    1.13     Shutdown,
    1.14 @@ -292,7 +292,7 @@
    1.15  struct _PRMetaTask
    1.16   { 
    1.17     PRTaskType      taskType;
    1.18 -   RequestHandler  reqHandler;      //Lang-specific hdlr for create, end, etc
    1.19 +//   RequestHandler  reqHandler;      //Lang-specific hdlr for create, end, etc
    1.20     int32          *taskID;          //is standard PR ID
    1.21     SlaveVP        *slaveAssignedTo; //no valid until task animated
    1.22     TopLevelFn      topLevelFn;      //This is the Fn executes as the task
    1.23 @@ -337,11 +337,13 @@
    1.24     PRSemEnv semEnvList[NUM_SEM_ENVS_IN_PROCESS]; //lines up the semEnvs, so can iterate through
    1.25     int32    numSemEnvs;     //must be less than num sem envs.. used to iterate through
    1.26      
    1.27 -   int32           numLiveGenericSlaves;
    1.28 -   int32           numLiveFreeTaskSlaves;
    1.29 +   int32           numLiveGenericSlvs;
    1.30 +   int32           numLiveFreeTaskSlvs;
    1.31     int32           numLiveTasks;
    1.32 -   bool32          coreIsDone[NUM_CORES][CACHE_LINE_SZ]; //Fixes false sharing
    1.33 -   
    1.34 +//   bool32          coreIsDone[NUM_CORES][CACHE_LINE_SZ]; //Fixes false sharing
    1.35 +
    1.36 +   PrivQ          *freeTaskSlvRecycleQ;
    1.37 +   SlaveVP         slotTaskSlvs[NUM_CORES][NUM_ANIM_SLOTS];
    1.38     void           *resultToReturn;
    1.39    
    1.40     SlaveVP        *seedSlv;