diff --git a/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java b/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java index 7faa8fd21..a085cc835 100755 --- a/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java +++ b/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java @@ -50,7 +50,7 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Reduce private Queue traverseTasks = new LinkedList(); private Queue reduceTasks = new LinkedList(); - private Queue outputMergeTasks = new LinkedList(); + private Queue outputMergeTasks = new LinkedList(); /** * Create a new hierarchical microscheduler to process the given reads and reference. @@ -159,7 +159,7 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Reduce // If any of the first MAX_OUTSTANDING merges aren't ready, the merge limit // has not been exceeded. - ShardOutput[] outputMergers = outputMergeTasks.toArray( new ShardOutput[0] ); + OutputMerger[] outputMergers = outputMergeTasks.toArray( new OutputMerger[0] ); for( int i = 0; i < outputMergers.length; i++ ) { if( !outputMergers[i].isComplete() ) return false; @@ -194,12 +194,12 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Reduce protected void mergeRemainingOutput() { OutputTracker outputTracker = GenomeAnalysisTK.Instance.getOutputTracker(); while( outputMergeTasks.size() > 0 ) { - ShardOutput shardOutput = outputMergeTasks.remove(); - synchronized(shardOutput) { - if( !shardOutput.isComplete() ) - shardOutput.waitForOutputComplete(); + OutputMerger outputMerger = outputMergeTasks.remove(); + synchronized(outputMerger) { + if( !outputMerger.isComplete() ) + outputMerger.waitForOutputComplete(); } - shardOutput.mergeInto( outputTracker.getGlobalOutStream(), outputTracker.getGlobalErrStream() ); + outputMerger.mergeInto( outputTracker.getGlobalOutStream(), outputTracker.getGlobalErrStream() ); } } @@ -212,14 +212,14 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Reduce if( traverseTasks.size() == 0 ) throw new IllegalStateException( "Cannot traverse; no pending traversals exist."); - ShardOutput shardOutput = new ShardOutput(); + OutputMerger outputMerger = new OutputMerger(); ShardTraverser traverser = new ShardTraverser( traversalEngine, walker, traverseTasks.remove(), reference, dataSource, - shardOutput ); + outputMerger ); Future traverseResult = threadPool.submit(traverser); @@ -230,7 +230,7 @@ public class HierarchicalMicroScheduler extends MicroScheduler implements Reduce if( !isShardTraversePending() ) reduceTree.complete(); - outputMergeTasks.add(shardOutput); + outputMergeTasks.add(outputMerger); return traverseResult; } diff --git a/java/src/org/broadinstitute/sting/gatk/executive/ShardOutput.java b/java/src/org/broadinstitute/sting/gatk/executive/OutputMerger.java similarity index 97% rename from java/src/org/broadinstitute/sting/gatk/executive/ShardOutput.java rename to java/src/org/broadinstitute/sting/gatk/executive/OutputMerger.java index ce64b7853..dde0e376c 100755 --- a/java/src/org/broadinstitute/sting/gatk/executive/ShardOutput.java +++ b/java/src/org/broadinstitute/sting/gatk/executive/OutputMerger.java @@ -31,7 +31,7 @@ import java.nio.channels.WritableByteChannel; * can be made at any time from any thread, but complete() should be called on the * thread which is doing the writing. */ -public class ShardOutput { +public class OutputMerger { /** * Create a unique identifier */ @@ -54,7 +54,7 @@ public class ShardOutput { private FileOutputStream out = null; private FileOutputStream err = null; - public ShardOutput() { + public OutputMerger() { try { outFile = File.createTempFile("gatkout_" + id, null); errFile = File.createTempFile("gatkerr_" + id, null); @@ -68,7 +68,7 @@ public class ShardOutput { } /** - * Waits for any the given ShardOutput to be ready for merging. + * Waits for any the given OutputMerger to be ready for merging. */ public synchronized void waitForOutputComplete() { try { diff --git a/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java b/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java index 7637f3b62..06f5714b6 100755 --- a/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java +++ b/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java @@ -36,14 +36,14 @@ public class ShardTraverser implements Callable { private Shard shard; private IndexedFastaSequenceFile reference; private SAMDataSource reads; - private ShardOutput output; + private OutputMerger output; public ShardTraverser( TraverseLociByReference traversalEngine, Walker walker, Shard shard, IndexedFastaSequenceFile reference, SAMDataSource reads, - ShardOutput output ) { + OutputMerger output ) { this.walker = walker; this.traversalEngine = traversalEngine; this.shard = shard;