--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-09-30 23:49:48 UTC (rev 1121)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-10-01 00:36:49 UTC (rev 1122)
@@ -23,7 +23,6 @@

 import static org.hps.monitoring.gui.Commands.VALIDATE_DATA_FILE;
 import static org.hps.monitoring.gui.model.ConfigurationModel.MONITORING_APPLICATION_LAYOUT_PROPERTY;
 import static org.hps.monitoring.gui.model.ConfigurationModel.SAVE_LAYOUT_PROPERTY;

-import static org.hps.monitoring.gui.model.ConfigurationModel.LOG_TO_FILE_PROPERTY;

 import hep.aida.jfree.plotter.PlotterRegion;
 import hep.aida.jfree.plotter.PlotterRegionListener;
 

@@ -86,6 +85,8 @@

 import org.hps.monitoring.subsys.SystemStatus;
 import org.hps.monitoring.subsys.SystemStatusListener;
 import org.hps.monitoring.subsys.SystemStatusRegistry;

+import org.hps.monitoring.subsys.et.EtSystemMonitor;
+import org.hps.monitoring.subsys.et.EtSystemStripCharts;

 import org.hps.record.composite.CompositeLoop;
 import org.hps.record.composite.CompositeLoopConfiguration;
 import org.hps.record.composite.EventProcessingThread;

@@ -1078,7 +1079,7 @@

      */
     private void disconnect(ConnectionStatus status) {
 

-        log(Level.FINE, "Disconnecting from the ET server.");

+        log(Level.FINE, "Disconnecting the current session.");

 
         // Cleanup the ET connection.
         cleanupEtConnection();

@@ -1089,11 +1090,11 @@

         // Finally, change application state to fully disconnected.
         setConnectionStatus(ConnectionStatus.DISCONNECTED);
 

-        // Set the application status from the caller if an error had occurred.

+        // Set the application status from the caller if an error occurred.

         if (status == ConnectionStatus.ERROR)
             setConnectionStatus(status);
 

-        log(Level.INFO, "Disconnected from the ET server.");

+        log(Level.INFO, "Disconnected from the session.");

     }
 
     /**

@@ -1102,7 +1103,9 @@

     private void cleanupEtConnection() {
         if (connection != null) {     
             if (connection.getEtSystem().alive()) {

+                log(Level.FINEST, "Cleaning up the ET connection.");

                 connection.cleanup();

+                log(Level.FINEST, "Done cleaning up the ET connection.");

             }
             connection = null;
         }

@@ -1346,19 +1349,18 @@

         }        
 
         

-        // DEBUG: Turn these off while doing other stuff!!!!
-        

+        // DEBUG: Turn these off while doing other stuff!!!!        

         // Using ET server?

-        //if (usingEtServer()) {

+        if (usingEtServer()) {

 
             // ET system monitor.
             // FIXME: Make whether this is run or not configurable through the JobPanel.

-            //loopConfig.add(new EtSystemMonitor());

+            loopConfig.add(new EtSystemMonitor());

             
             // ET system strip charts.
             // FIXME: Make whether this is run or not configurable through the JobPanel.

-            //loopConfig.add(new EtSystemStripCharts());
-        //}

+            loopConfig.add(new EtSystemStripCharts());
+        }

               
         // RunPanel updater.
         loopConfig.add(runPanel.new RunModelUpdater());

@@ -1450,20 +1452,17 @@

         try {
             // Log message.
             logger.log(Level.FINER, "Stopping the session.");

+            
+            // Kill the watchdog thread which looks for disconnects, if it is active.
+            killSessionWatchdogThread();

-            // Save AIDA file.

+            // Automatically write AIDA file from job settings.

             saveAidaFile();
         

-            // Disconnect from the ET system.
-            if (usingEtServer()) {
-                // Disconnect from the ET system.
-                disconnect();
-            } else { 
-                // When using direct file streaming, just need to toggle GUI state.
-                setDisconnectedGuiState();
-            }

+            // Disconnect from ET system, if using the ET server, and set the proper disconnected GUI state.           
+            disconnect();

-            // Terminate event processing.

+            // Stop the event processing, which is called after the ET system goes down to avoid hanging in calls to ET system.

             stopEventProcessing();
                 
             logger.log(Level.INFO, "Session was stopped.");

@@ -1475,47 +1474,42 @@

     }
                                        
     /**

-     * Finish event processing and stop its thread, first killing the session watchdog 
-     * thread, if necessary.  The event processing thread may still be alive after 
-     * this method, e.g. if there is a call to <code>EtSystem.getEvents()</code> happening.
-     * In this case, event processing will exit later when the ET system goes down.

+     * Stop the event processing by executing a <code>STOP</code> command on the 
+     * record loop and killing the event processing thread.  This is executed
+     * after the ET system is disconnected so that the event processing does
+     * not potentially hang in a call to <code>EtSystem.getEvents()</code> forever.

      */
     private void stopEventProcessing() {

-            
-        // Is the event processing thread not null? 

+
+        // Is the event processing thread not null?

         if (processingThread != null) {
             
             // Is the event processing thread actually still alive?
             if (processingThread.isAlive()) {

-
-                // Interrupt and kill the event processing watchdog thread if necessary.
-                killSessionWatchdogThread();
-               

+                

                 // Request the event processing loop to execute stop.

-                loop.execute(Command.STOP);                

+                loop.execute(Command.STOP);
+                
+                try {
+                    // This should always work, because the ET system is disconnected before this.
+                    processingThread.join();
+                } catch (InterruptedException e) {
+                    // Don't know when this would ever happen.
+                    e.printStackTrace();                   
+                }

             }
 

-            // Wait for the event processing thread to finish.  This should just return
-            // immediately if it isn't alive so don't bother checking if alive is false.
-            try {
-                // In the case where ET is configured for sleep or timed wait, an untimed join could 
-                // block forever, so only wait for ~1 second before continuing.  The EventProcessingChain
-                // should still cleanup automatically when its thread completes after the ET system goes down.
-                processingThread.join(1000);
-            } catch (InterruptedException e) {
-                // Don't know when this would ever happen.
-            }
-       

             // Notify of last error that occurred in event processing.
             if (loop.getLastError() != null) {
                 errorHandler.setError(loop.getLastError()).log().printStackTrace();
             }

-       
-            // Reset event processing objects for next session.
-            loop.dispose();
-            loop = null;

+
+            // Set the event processing thread to null as it is unusable now.

             processingThread = null;
         }

+
+        // Set the loop to null as a new one will be created for next session.
+        loop = null;

     }
 
     /**

@@ -1532,7 +1526,8 @@

                     // This should always work once the thread is interupted.
                     sessionWatchdogThread.join();
                 } catch (InterruptedException e) {

-                    // Should never happen.

+                    // This should never happen.
+                    e.printStackTrace();

                 }
             }
             // Set the thread object to null.

@@ -1559,7 +1554,8 @@

 
             } catch (InterruptedException e) {
                 // This probably just means that the disconnect button was pushed, and this thread should

-                // no longer wait on event processing to finish.

+                // no longer monitor the event processing.
+                e.printStackTrace();

             }
         }
     }

--- java/trunk/record-util/src/main/java/org/hps/record/AbstractRecordQueue.java	2014-09-30 23:49:48 UTC (rev 1121)
+++ java/trunk/record-util/src/main/java/org/hps/record/AbstractRecordQueue.java	2014-10-01 00:36:49 UTC (rev 1122)
@@ -14,7 +14,6 @@

  * {@link #next()} method to get the next record, which might not be immediately
  * available.
  */

-// TODO: Add max elements argument to limit pile up of unconsumed events.

 public abstract class AbstractRecordQueue<RecordType> extends AbstractRecordSource {
 
     // The queue, which is a linked list with blocking behavior. 

@@ -26,6 +25,7 @@

     // The amount of time to wait for an LCIO event from the queue before dying.
     long timeOutMillis = -1;
     

+    

     /**
      * Constructor that takes the timeout time in seconds.
      * @param timeoutSeconds the timeout time in seconds

--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java	2014-09-30 23:49:48 UTC (rev 1121)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java	2014-10-01 00:36:49 UTC (rev 1122)
@@ -33,16 +33,12 @@

     
     boolean paused = false;
     boolean stopOnErrors = true;

-    boolean done = false;

     
     CompositeLoopConfiguration config = null;

-            
-    // Look in javadoc API and DefaultRecordLoop for what this does.
-    //this._stopOnEOF
-                

+                            

     /**
      * No argument constructor.  

-     * The {@link #configure(CompositeLoopConfiguration)} method must be

+     * The {@link #setCompositeLoopConfiguration(CompositeLoopConfiguration)} method must be

      * called on the loop manually.
      */
     public CompositeLoop() {

@@ -55,7 +51,7 @@

      */
     public CompositeLoop(CompositeLoopConfiguration config) {
         setRecordSource(recordSource);

-        configure(config);

+        setCompositeLoopConfiguration(config);

     }
     
     /**

@@ -108,7 +104,6 @@

         
         // Stop the event processing.
         this.execute(Command.STOP);

-        done = true;

     }
 
     /**

@@ -129,7 +124,6 @@

         
         // Stop the event processing.
         this.execute(Command.STOP);

-        done = true;

     }        
     
     /**

@@ -175,17 +169,8 @@

             return false;
         }
     }

-        

+            

     /**

-     * True if the loop is done processing.  This is 
-     * set to <code>true</code> when fatal errors occur.
-     * @return
-     */
-    public boolean isDone() {
-        return done;
-    }
-    
-    /**

      * Get the last error that occurred.
      * @return The last error that occurred.
      */

@@ -230,12 +215,20 @@

         }
         return getSupplied();
     }

-        

+    
+    public void setConfiguration(Object object) {
+        if (object instanceof CompositeLoopConfiguration) {
+            setCompositeLoopConfiguration((CompositeLoopConfiguration)object);
+        } else {
+            throw new IllegalArgumentException("Wrong type of object to configure CompositeLoop: " + object.getClass().getCanonicalName());
+        }
+    }
+    

     /**
      * Configure the loop using a {@link CompositeLoopConfiguration} object.
      * @param config The CompositeLoopConfiguration object containing the loop configuration parameter values.
      */

-    public final void configure(CompositeLoopConfiguration config) {

+    void setCompositeLoopConfiguration(CompositeLoopConfiguration config) {

         
         if (this.config != null)
             throw new RuntimeException("CompositeLoop has already been configured.");

--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopAdapter.java	2014-09-30 23:49:48 UTC (rev 1121)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoopAdapter.java	2014-10-01 00:36:49 UTC (rev 1122)
@@ -32,6 +32,7 @@

      * @param loopEvent 
      */
     public void finish(LoopEvent loopEvent) {

+        System.out.println(this.getClass().getCanonicalName() + ".finish");

         // Call end job hook on all processors.
         for (CompositeRecordProcessor processor : processors) {
             processor.endJob();

--- java/trunk/record-util/src/main/java/org/hps/record/composite/EventProcessingThread.java	2014-09-30 23:49:48 UTC (rev 1121)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/EventProcessingThread.java	2014-10-01 00:36:49 UTC (rev 1122)
@@ -1,5 +1,7 @@

 package org.hps.record.composite;
 

+import org.freehep.record.loop.RecordLoop;
+

 /**
  * Class for running the {@link CompositeLoop} on a separate thread.
  */

@@ -22,33 +24,29 @@

     @Override
     public void run() {                
                 

-        // Keep looping until the event processing is flagged as done.
-        while (true) {
-            // Is the processing unpaused?            
-            // TODO: See if can check for IDLE state. (???)
-            if (!loop.isPaused()) {

+        // Flag that is turned on when looping starts.
+        boolean started = false;
+        
+        // Keep looping until the event processing is done.
+        while (true) {                        
+            
+            // If the loop was started and now is in the IDLE state, it means
+            // that STOP was executed, so break from the processing while loop.
+            if (started && loop.getState().equals(RecordLoop.State.IDLE)) {                
+                // Stop record processing.
+                break;
+            }
+                        
+            // Is the processing unpaused?
+            if (!loop.isPaused()) {                                                

+                // Set a flag to indicate that looping has started.
+                started = true;
+                

                 // Loop until done, error occurs, or pause is requested.
                 // FIXME: The maximum number of records should be used here.
                 loop.loop(-1);

-                
-                // If paused, current record will still be completed!
-                
-                // Is loop done?
-                // TODO: See if can check for IDLE state instead.
-                if (loop.isDone()) {
-                    // Stop record processing.
-                    break;
-                }
-            }
-            
-            // Sleep for a little while between loop iterations (e.g. while paused).
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }

+            }            

         }

-        

     }
 }

\ No newline at end of file