Changeset 654 in tmcsimulator

Timestamp:

09/09/2022 04:11:08 PM (4 years ago)

Author:

jdalbey

Message:

TrafficModelManager?.java changed timer from Swing timer to java.util.timer to avoid any potential thread locking issues.
CADServer.java moved call to traffic mgr run() until after setVisible ... fix obscure bug on laptop NetBeans.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml (modified) (1 diff)
• IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (modified) (1 diff)
• src/tmcsim/RunSim.java (deleted)
• src/tmcsim/cadsimulator/CADServer.java (modified) (2 diffs)
• src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (3 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml

@@ -1034 +1034 @@
     </target>
     <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <!--When you do "Clean and Build" I think it does this jar target, and sets as the main file in the manifest
+        whichever project configuration is current. -->
     <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
     <!--

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

@@ -55 +55 @@
 platform.active=default_platform
 javac.compilerargs=
-main.class=tmcsim.RunSim
+main.class=tmcsim.cadsimulator.CADServer
 dist.jar=${dist.dir}/TMCSim.jar
 javac.test.processorpath=${javac.test.classpath}

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -291 +291 @@
                     theCoordinator);
             theTrafficMgr.addObserver(theViewer);
-            theTrafficMgr.run();
-
+    
             theMediaMgr = new MediaManager(
                     cadServerProperties.getProperty(
@@ -346 +345 @@
 
         theViewer.setVisible(true);
+        // I think the traffic mgr has to run AFTER viewer is set visible, because
+        // inside run() it loads traffic events and wants to notify the view
+        // to update itself ... so the view must be visible first?
+        // When this stmt was prior to setVisible, we hung on setVisible.
+        theTrafficMgr.run();
 
     }

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -30 +30 @@
 import javax.swing.JWindow;
 import javax.swing.Timer;
+import java.util.TimerTask;
 import javax.swing.UIManager;
 import tmcsim.cadsimulator.Coordinator;
@@ -146 +147 @@
         loadEvents();
 
+        java.util.Timer t = new java.util.Timer();
+
         // Create a timer that fetches the simulation time every second.
-        Timer timer = new Timer(ONE_SECOND, new ActionListener()
-        {
-            // Every second, see if an event should be launched
-            public void actionPerformed(ActionEvent e)
+        t.scheduleAtFixedRate(
+            new TimerTask()
             {
-                String currentATMStime = "";
-                Date simClock = new Date();
-                // Obtain the simulation time from the CAD server
-                try
+                // Every second, see if an event should be launched
+                public void run()
                 {
-                    long simtime = theCoordinator.getCurrentSimulationTime();
-                    currentClock = theCoordinator.formatTimeInSeconds(simtime);
-                    // For Debugging, show the ATMS time
-//                    long ATMStime = theCoorInt.getATMStime();       
-//                    Date atmsdate = new Date(ATMStime);
-//                    currentATMStime = formatter.format(atmsdate);
+                    String currentATMStime = "";
+                    Date simClock = new Date();
+                    // Obtain the simulation time from the CAD server
                     try
                     {
-                        simClock = formatter.parse(currentClock);
+                        long simtime = theCoordinator.getCurrentSimulationTime();
+                        currentClock = theCoordinator.formatTimeInSeconds(simtime);
+                        // For Debugging, show the ATMS time
+    //                    long ATMStime = theCoorInt.getATMStime();       
+    //                    Date atmsdate = new Date(ATMStime);
+    //                    currentATMStime = formatter.format(atmsdate);
+                        try
+                        {
+                            simClock = formatter.parse(currentClock);
+                        }
+                        catch (ParseException ex)
+                        {
+                            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
+                            System.out.println("Invalid simulation clock time found");
+                            System.exit(-1);
+                        }
                     }
-                    catch (ParseException ex)
+                    catch (RemoteException ex)
                     {
+                        System.out.println("Remote Exception reading sim or ATMS clock time");
                         Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
-                        System.out.println("Invalid simulation clock time found");
-                        System.exit(-1);
+                    }
+                    // If we have any events left to process
+                    if (!eventQueue.isEmpty())
+                    {
+                        // Get the time to launch the next event
+                        TrafficEvent nextEvent = eventQueue.peek();
+                        Date eventTime = nextEvent.eventDate;
+                        // Check the queue of events to see if the first
+                        // item should be launched.  IF so, 
+                        // issue that command and remove it from queue.
+                        if (eventTime.before(simClock) || eventTime.equals(simClock))
+                        {
+                            System.out.println("LAUNCHING EVENT: " + nextEvent.toString());
+                            // apply colorization to highways
+                            highways.applyColorToHighwayStretch(nextEvent.routeNumber, nextEvent.dir,
+                                    nextEvent.postmile, nextEvent.range, nextEvent.color);
+                            // Remove this event from the queue, we're done with it.
+                            eventQueue.remove();
+                            setChanged();
+                            // Send updated list to view
+                            // notifyObservers(getEventQueue());
+                            // Notify view it should scroll to next event
+                            notifyObservers(new Integer(0));
+                        }
+                        setChanged();
+                        notifyObservers(currentClock);
                     }
                 }
-                catch (RemoteException ex)
-                {
-                    System.out.println("Remote Exception reading sim or ATMS clock time");
-                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
-                }
-                // If we have any events left to process
-                if (!eventQueue.isEmpty())
-                {
-                    // Get the time to launch the next event
-                    TrafficEvent nextEvent = eventQueue.peek();
-                    Date eventTime = nextEvent.eventDate;
-                    // Check the queue of events to see if the first
-                    // item should be launched.  IF so, 
-                    // issue that command and remove it from queue.
-                    if (eventTime.before(simClock) || eventTime.equals(simClock))
-                    {
-                        System.out.println("LAUNCHING EVENT: " + nextEvent.toString());
-                        // apply colorization to highways
-                        highways.applyColorToHighwayStretch(nextEvent.routeNumber, nextEvent.dir,
-                                nextEvent.postmile, nextEvent.range, nextEvent.color);
-                        // Remove this event from the queue, we're done with it.
-                        eventQueue.remove();
-                        setChanged();
-                        // Send updated list to view
-                        // notifyObservers(getEventQueue());
-                        // Notify view it should scroll to next event
-                        notifyObservers(new Integer(0));
-                    }
-                    setChanged();
-                    notifyObservers(currentClock);
-                }
-            }
-        });
-        timer.start();
-
-        // Always write to json for google map display
-        Thread wtJson = new WriteToJsonThread();
+            },
+            0, 
+            ONE_SECOND
+            );
+
+        // Also write to json for google map display, every ten seconds.
+        WriteToJsonTask wtJson = new WriteToJsonTask();
         wtJson.start();
+        System.out.println("Traffic Model Mgr init complete.");
     }
     /** Accessor to event queue
@@ -401 +408 @@
      *  by Google Maps.
      */
-    class WriteToJsonThread extends Thread
-    {
-
-        public void run()
-        {
-            System.out.println("WriteToJson Thread starting.");
-            // Run indefinitely
-            while (true)
-            {
-                 // Write the highway network status to Json
-                String geojson = highways.toJson();
-                PrintWriter out;
-                try
+    class WriteToJsonTask
+    {
+        void start()
+        {
+            System.out.println("WriteToJson Task starting.");
+            java.util.Timer tasktimer = new java.util.Timer();
+            tasktimer.scheduleAtFixedRate(
+                new TimerTask()
                 {
-                    // currently writes to local file
-                    out = new PrintWriter(jsonPath);
-                    out.print(geojson);
-                    out.close();
-                }
-                catch (FileNotFoundException ex)
-                {
-                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
-                }
-                // Wait for Google Map to process the data we just sent
-                try
-                {
-                    Thread.sleep(10000);
-                }
-                catch (InterruptedException ie)
-                {
-                    ie.printStackTrace();
-                }
-            }
-
+                    public void run()
+                    {
+                        String geojson = highways.toJson();
+                        PrintWriter out;
+                        try
+                        {
+                            // currently writes to local file
+                            out = new PrintWriter(jsonPath);
+                            out.print(geojson);
+                            out.close();
+                        }
+                        catch (FileNotFoundException ex)
+                        {
+                            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
+                        }
+                    }    
+                },
+                0,   // run first occurrence now
+                10000); // run every ten seconds
         }
     }