# HG changeset patch # User Me # Date 1280183366 25200 # Node ID 5a2068cbc28be65d6b78e5b530a74de8942e2c1c # Parent 668278fa7a630e991b057a386901217e6bfa073c MasterLoop -- removed commented out old sched-all-then-queue alg diff -r 668278fa7a63 -r 5a2068cbc28b MasterLoop.c --- a/MasterLoop.c Mon Jul 26 15:25:53 2010 -0700 +++ b/MasterLoop.c Mon Jul 26 15:29:26 2010 -0700 @@ -163,29 +163,6 @@ else { masterEnv->numToPrecede = numFilled - NUM_CORES + 1; } -/* - //put some scheduled slaves in, then Master continuation, then rest - //Adjust position of master such that it maintains close to a fixed - // ratio --> make NUM_CORES - 1 slots or fewer come after the master - - for( filledSlotIdx = 0; filledSlotIdx < numPrecede; filledSlotIdx++) - { - writeVMSQ( filledSlots[ filledSlotIdx ]->procrAssignedToSlot, workQ ); - } - - //enqueue continuation of this loop - // note that After this enqueue, continuation might sneak through - writeVMSQ( masterEnv->masterVirtPr, workQ ); - - for( filledSlotIdx = numPrecede; - filledSlotIdx < numFilled; - filledSlotIdx++) - { - writeVMSQ( filledSlots[ filledSlotIdx ]->procrAssignedToSlot, workQ ); - } - - masterEnv->numFilled = 0; -*/ //Save stack ptr and frame -- don't need to, take out later, but safe // Also, wait to set stillRunning to FALSE until just before jump, to