Merged bug fix from Stable into Unstable

This commit is contained in:
Matt Hanna 2012-01-09 23:08:46 -05:00
commit 509c3d87b0
1 changed files with 6 additions and 2 deletions

View File

@ -27,8 +27,8 @@ import java.util.concurrent.Future;
public class TreeReducer implements Callable { public class TreeReducer implements Callable {
private HierarchicalMicroScheduler microScheduler; private HierarchicalMicroScheduler microScheduler;
private TreeReducible walker; private TreeReducible walker;
private final Future lhs; private Future lhs;
private final Future rhs; private Future rhs;
/** /**
* Create a one-sided reduce. Result will be a simple pass-through of the result. * Create a one-sided reduce. Result will be a simple pass-through of the result.
@ -99,6 +99,10 @@ public class TreeReducer implements Callable {
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();
// Constituent bits of this tree reduces are no longer required. Throw them away.
this.lhs = null;
this.rhs = null;
microScheduler.reportTreeReduceTime( endTime - startTime ); microScheduler.reportTreeReduceTime( endTime - startTime );
return result; return result;