1.1 --- a/SchedulingMaster.c	Tue Mar 13 10:02:06 2012 -0700
     1.2 +++ b/SchedulingMaster.c	Tue Mar 13 18:28:04 2012 -0700
     1.3 @@ -26,18 +26,18 @@
     1.4   *Polls each sched slot exactly once, hands any requests made by a newly
     1.5   * done slave to the "request handler" plug-in function
     1.6   *
     1.7 - *Any slots that need a Slv assigned are given to the "schedule"
     1.8 + *Any slots that need a Slv assigned are given to the "assign"
     1.9   * plug-in function, which tries to assign a Slv (slave) to it.
    1.10   *
    1.11 - *When all slots needing a processor have been given to the schedule plug-in,
    1.12 - * a fraction of the slaves successfully scheduled are put into the
    1.13 + *When all slots needing a processor have been given to the assign plug-in,
    1.14 + * a fraction of the slaves successfully assigned are put into the
    1.15   * work queue, then a continuation of this function is put in, then the rest
    1.16 - * of the Slvs that were successfully scheduled.
    1.17 + * of the Slvs that were successfully assigned.
    1.18   *
    1.19   *The first thing the continuation does is busy-wait until the previous
    1.20   * animation completes.  This is because an (unlikely) continuation may
    1.21   * sneak through queue before previous continuation is done putting second
    1.22 - * part of scheduled slaves in, which is the only race condition.
    1.23 + * part of assigned slaves in, which is the only race condition.
    1.24   *
    1.25   */
    1.26  
    1.27 @@ -78,7 +78,7 @@
    1.28     MasterEnv      *masterEnv;
    1.29     VMSQueueStruc  *readyToAnimateQ;
    1.30     
    1.31 -   Sched_Assigner  slaveAssigner;
    1.32 +   SlaveAssigner  slaveAssigner;
    1.33     RequestHandler  requestHandler;
    1.34     void           *semanticEnv;
    1.35  
    1.36 @@ -143,7 +143,7 @@
    1.37        if( currSlot->needsSlaveAssigned )
    1.38         {    //give slot a new Slv
    1.39           schedSlaveVP =
    1.40 -          (*slaveAssigner)( semanticEnv, thisCoresIdx );
    1.41 +          (*slaveAssigner)( semanticEnv, thisCoresIdx, currSlot );
    1.42           
    1.43           if( schedSlaveVP != NULL )
    1.44            { currSlot->slaveAssignedToSlot = schedSlaveVP;