1.1 --- a/AnimationMaster.c	Fri Mar 16 10:43:15 2012 -0700
     1.2 +++ b/AnimationMaster.c	Fri Mar 16 23:40:55 2012 -0700
     1.3 @@ -12,14 +12,6 @@
     1.4  #include "VMS.h"
     1.5  
     1.6  
     1.7 -//========================= Local Fn Prototypes =============================
     1.8 -void inline
     1.9 -stealWorkInto( SchedSlot *currSlot, VMSQueueStruc *readyToAnimateQ,
    1.10 -               SlaveVP *masterVP );
    1.11 -
    1.12 -//===========================================================================
    1.13 -
    1.14 -
    1.15  
    1.16  /*The animationMaster embodies most of the animator of the language.  The
    1.17   * animator is what emodies the behavior of language constructs. 
    1.18 @@ -129,7 +121,7 @@
    1.19   { 
    1.20        //Used while scanning and filling animation slots
    1.21     int32           slotIdx, numSlotsFilled;
    1.22 -   SchedSlot      *currSlot, **schedSlots;
    1.23 +   AnimSlot      *currSlot, **animSlots;
    1.24     SlaveVP        *assignedSlaveVP;  //the slave chosen by the assigner
    1.25  
    1.26        //Local copies, for performance
    1.27 @@ -143,7 +135,7 @@
    1.28     masterEnv        = (MasterEnv*)_VMSMasterEnv;
    1.29     
    1.30     thisCoresIdx     = masterVP->coreAnimatedBy;
    1.31 -   schedSlots       = masterEnv->allSchedSlots[thisCoresIdx];
    1.32 +   animSlots       = masterEnv->allAnimSlots[thisCoresIdx];
    1.33  
    1.34     requestHandler   = masterEnv->requestHandler;
    1.35     slaveAssigner    = masterEnv->slaveAssigner;
    1.36 @@ -159,7 +151,7 @@
    1.37     numSlotsFilled = 0;
    1.38     for( slotIdx = 0; slotIdx < NUM_SCHED_SLOTS; slotIdx++)
    1.39      {
    1.40 -      currSlot = schedSlots[ slotIdx ];
    1.41 +      currSlot = animSlots[ slotIdx ];
    1.42  
    1.43           //Check if newly-done slave in slot, which will need request handld
    1.44        if( currSlot->workIsDone )
    1.45 @@ -183,7 +175,7 @@
    1.46              //put the chosen slave into slot, and adjust flags and state
    1.47           if( assignedSlaveVP != NULL )
    1.48            { currSlot->slaveAssignedToSlot = assignedSlaveVP;
    1.49 -            assignedSlaveVP->schedSlotAssignedTo       = currSlot;
    1.50 +            assignedSlaveVP->animSlotAssignedTo       = currSlot;
    1.51              currSlot->needsSlaveAssigned  = FALSE;
    1.52              numSlotsFilled               += 1;
    1.53            }
    1.54 @@ -194,6 +186,7 @@
    1.55     
    1.56     masterSwitchToCoreCtlr( masterVP );
    1.57     flushRegisters();
    1.58 +         DEBUG__printf(FALSE,"came back after switch to core -- so lock released!");
    1.59     }//while(1) 
    1.60   }
    1.61