java/trunk/record-util
--- java/trunk/record-util/pom.xml 2014-09-03 18:11:04 UTC (rev 945)
+++ java/trunk/record-util/pom.xml 2014-09-03 18:35:04 UTC (rev 946)
@@ -13,7 +13,7 @@
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/record-util/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/record-util/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/record-util/</developerConnection>
- </scm>
+ </scm>
<build>
<plugins>
<plugin>
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopAdapter.java 2014-09-03 18:11:04 UTC (rev 945)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopAdapter.java 2014-09-03 18:35:04 UTC (rev 946)
@@ -68,7 +68,7 @@
processor.process((CompositeRecord) record.getRecord());
} catch (Exception e) {
// Throw the processing error so the loop can perform proper handling of it.
- throw new RecordProcessingException("Error during record processing.", e);
+ throw new RecordProcessingException("Exception occurred during record processing.", e);
}
}
}
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeSource.java 2014-09-03 18:11:04 UTC (rev 945)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeSource.java 2014-09-03 18:35:04 UTC (rev 946)
@@ -11,7 +11,7 @@
public final class CompositeSource extends AbstractRecordSource {
CompositeRecord currentRecord;
- int sequenceNumber = 0;
+ int sequenceNumber = 1;
public void next() throws IOException, NoSuchRecordException {
currentRecord = new CompositeRecord();
java/trunk/record-util/src/main/java/org/hps/record/processing
--- java/trunk/record-util/src/main/java/org/hps/record/processing/ProcessingChain.java 2014-09-03 18:11:04 UTC (rev 945)
+++ java/trunk/record-util/src/main/java/org/hps/record/processing/ProcessingChain.java 2014-09-03 18:35:04 UTC (rev 946)
@@ -166,15 +166,8 @@
compositeLoop.addProcessor(new MaxRecordsProcessor(configuration.maxRecords));
}
}
-
+
/**
- * Resume event processing from pause mode.
- */
- public void resume() {
- this.paused = false;
- }
-
- /**
* Loop over events until processing ends for some reason.
*/
public void run() {
@@ -182,16 +175,20 @@
while (true) {
// Is the processing unpaused?
if (!paused) {
- // Loop until done or error occurs.
+ // Loop until done, error occurs, or pause is requested.
compositeLoop.execute(Command.GO, true);
- if (compositeLoop.getLastError() != null)
- System.out.println("loop error: " + compositeLoop.getLastError().getMessage());
+
+ // Is loop done?
if (compositeLoop.isDone()) {
- // Break from processing loop.
+ // Stop record processing.
break;
}
}
- // FIXME: Should this thread sleep for a bit here?
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
}
@@ -213,10 +210,17 @@
/**
* Pause the event processing.
*/
- public void pause() {
+ public void pause() {
compositeLoop.execute(Command.PAUSE);
paused = true;
}
+
+ /**
+ * Resume event processing from pause mode.
+ */
+ public void resume() {
+ this.paused = false;
+ }
/**
* Get the next event e.g. while in pause mode.