Changeset 40 in tmcsimulator

Timestamp:

05/06/2016 03:24:53 PM (10 years ago)

Author:

jdalbey

Message:

Remove some log messages from ParamicsFileReader? and Writer to address memory issues

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (modified) (1 diff)
• config/cad_simulator_logging.properties (modified) (1 diff)
• config/svn-version.txt (modified) (1 diff)
• src/tmcsim/client/cadclientgui/screens/CADMenu.java (modified) (3 diffs)
• src/tmcsim/paramicscommunicator/ParamicsFileReader.java (modified) (2 diffs)
• src/tmcsim/paramicscommunicator/ParamicsFileWriter.java (modified) (4 diffs)

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

@@ -77 +77 @@
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
+run.jvmargs=-DCONFIG_DIR=config/testConfig
 run.test.classpath=\
     ${javac.test.classpath}:\

trunk/config/cad_simulator_logging.properties

@@ -14 +14 @@
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+LogFile = paramics_communication_log.xml
+CADSimulatorHost = 127.0.0.1
+CADSimulatorRMIPort = 4450
+

trunk/config/svn-version.txt

@@ -1 @@
-30
+37M
 
         # Do not edit. This file is autogenerated by the Ant build script #

trunk/src/tmcsim/client/cadclientgui/screens/CADMenu.java

@@ -4 +4 @@
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -12 +13 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.imageio.ImageIO;
 
 import javax.swing.Box;
@@ -83 +91 @@
 
         setTitle("Inform CAD");
+        URL url = null;
+        try
+        {
+            url = new URL("http://i1030.photobucket.com/albums/y362/sendeva66/antclipart2.jpg");
+        } catch (MalformedURLException ex)
+        {
+            Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, "can't access url", ex);
+        }
+        Image image = null;
+        try
+        {
+            image = ImageIO.read(url);
+            setIconImage(image);
+        } catch (IOException ex)
+        {
+            Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        // Doesn't work: file path problem?
+//        ImageIcon myIcon = new ImageIcon(getClass().getClassLoader().getResource("images/CADicon.png"));
+//        setIconImage(myIcon.getImage());
         setPreferredSize(new Dimension(1195, 178));
         setResizable(true);

trunk/src/tmcsim/paramicscommunicator/ParamicsFileReader.java

@@ -80 +80 @@
         public void run()
         {
-            paramLogger.logp(Level.INFO,
-                    "ParamicsFileReader.ReaderTimerTask", "run()",
-                    "Waiting for " + inputFile + " to be modified.");
+//            paramLogger.logp(Level.INFO,
+//                    "ParamicsFileReader.ReaderTimerTask", "run()",
+//                    "Waiting for " + inputFile + " to be modified.");
             if (lastModified < inputFile.lastModified())
             {
-                paramLogger.logp(Level.INFO,
-                        "ParamicsFileReader.ReaderTimerTask", "run()",
-                        "Cool, " + inputFile + " has been modified, let's read it.");
+//                paramLogger.logp(Level.INFO,
+//                        "ParamicsFileReader.ReaderTimerTask", "run()",
+//                        "Cool, " + inputFile + " has been modified, let's read it.");
 
                 try
@@ -101 +101 @@
                     Element messageElem = readerDoc.createElement(PARAMICS_COMM_TAGS.MESSAGE.tag);
                     String fileContents = readFromFile();
-                    paramLogger.logp(Level.INFO,
-                            "ParamicsFileReader.ReaderTimerTask", "run()",
-                            "Nice, we read " + fileContents);
+ //                   int stringlen = Math.min(160, fileContents.length()-1);
+                    // Log two lines that were read
+//                    paramLogger.logp(Level.INFO,
+//                            "ParamicsFileReader.ReaderTimerTask", "run()",
+//                            "Nice, we read " + fileContents.length() + " bytes.");
                     messageElem.appendChild(readerDoc.createTextNode(fileContents));
                     readerElem.appendChild(messageElem);

trunk/src/tmcsim/paramicscommunicator/ParamicsFileWriter.java

@@ -170 +170 @@
         synchronized (lock)
         {
-            paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                    + "current queue size = " + queuedMessages.size());
-
+//            paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
+//                    + "current queue size = " + queuedMessages.size());
+            double freebytes =  Runtime.getRuntime().freeMemory();
+            freebytes = freebytes / 1000000;
+            paramLogger.log(Level.INFO, "ParamicsFileWriter: "
+                    + freebytes + " MB free");
+            
             //messages already queued... get in line.
             if (queuedMessages.size() > 0)
@@ -178 +182 @@
                 queuedMessages.add(messageElem);
 
-                paramLogger.log(Level.INFO, "Queueing message, new queue "
-                        + "size = " + queuedMessages.size());
+//                paramLogger.log(Level.INFO, "Queueing message, new queue "
+//                        + "size = " + queuedMessages.size());
             } //No modification since last write. (first queue)
             else if (lastModified >= new File(outputFile).lastModified())
             {
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "adding msg to queue.");
+//                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
+//                        + "adding msg to queue.");
                 queuedMessages.add(messageElem);
 
@@ -190 +194 @@
                         0L, TIMER_DURATION);
 
-                paramLogger.log(Level.INFO, "First message queued");
+//                paramLogger.log(Level.INFO, "First message queued");
             } //free and clear, write.
             else
             {
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "try to writeToFile" + outputFile);
+//                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
+//                        + "try to writeToFile" + outputFile);
                 try
                 {
@@ -210 +214 @@
                             0L, TIMER_DURATION);
                 }
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "writeToFile succeeded.");
+//                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
+//                        + "writeToFile succeeded.");
             }
         }