--- projects/cms/source/host/java/SystemMonitor.java	2000/11/27 20:36:30	1.2
+++ projects/cms/source/host/java/SystemMonitor.java	2000/12/08 15:45:28	1.7
@@ -2,6 +2,10 @@
 
 //---IMPORTS---
 
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
 /**
  * Gathers system information then outputs it as XML
  * Collects data based on properties gained from the configurator
@@ -9,7 +13,7 @@
  * the timeout has passed.
  *
  * @author  $Author: ab11 $
- * @version $Id: SystemMonitor.java,v 1.2 2000/11/27 20:36:30 ab11 Exp $
+ * @version $Id: SystemMonitor.java,v 1.7 2000/12/08 15:45:28 ab11 Exp $
  */
 class SystemMonitor {
 
@@ -29,13 +33,25 @@ class SystemMonitor {
         // like things to monitor
         
         lastCheck = System.currentTimeMillis();
-        sequence = 0;
+        sequence = 1;
 
 
         // why oh why wont ultra edit let me put Long in the next line? oh its trying to 
         // correct keywords =|
-        checkInterval = Long.parseLong(config.getProperty("UDPINTEVAL"));
+        /*
         
+        try {
+        	udpcheckInterval = Long.parseLong(config.getProperty("UDPUpdateTime")) * 1000;
+        }
+        catch ( NumberFormatException e ){
+        	System.out.println("The value for UDPUpdateTime is invalid, using a default");
+        	// 5 mins
+        	udpcheckInterval = 5000 * 60;
+        }
+        */
+        
+        // make the check interval into seconds
+        
     }
 
 //---PUBLIC METHODS---
@@ -47,29 +63,44 @@ class SystemMonitor {
     */
     public String getInfo(){
         // called to retrieve the stored averages and output them as a XML string
-        XMLFormatter xml = new XMLFormatter("packet");
+        String host = new String();
+        String ip = new String();
+        try {
+            host = InetAddress.getLocalHost().getHostName();
+		    ip = InetAddress.getLocalHost().getHostAddress();
+        } catch(UnknownHostException e) {
+            System.out.println(e);
+        }
+		String date = Long.toString(System.currentTimeMillis());
+        XMLFormatter xml = new XMLFormatter("packet", "machine_name=\""+host+"\" ip=\""+ip+"\" date=\""+date+"\" seq_no=\""+sequence+"\"");
+
+	    // get and decode the data
+	    DecodeCPU_TXT details = new DecodeCPU_TXT();
+
+        // add the decoded info
+        xml.addString(details.getItems());
         
-        // just send some dummy info for now.
-        xml.addNest("packet_info");
-            String currentTime = Long.toString(System.currentTimeMillis());
-            xml.addElement("date_time", currentTime );
-            xml.addElement("sequence", Integer.toString(sequence));
-        xml.closeNest();
-        xml.addNest("core");
-            xml.addElement("cpu","100");
-            xml.addElement("memory","200");
-        xml.closeNest();
-        xml.addNest("additional");
-            xml.addElement("users","20");
-        xml.closeNest();
         
+        /*
         // MUST FIX THIS..!!!!
-        while ( System.currentTimeMillis() < ( lastCheck + checkInterval ) ){
-          // errm do nothing.. block or something.      
+        try {
+        	long updateIn = ( lastCheck + udpcheckInterval )-System.currentTimeMillis();
+        	if ( updateIn > 0 ){
+        		Thread.sleep(updateIn);
+        	}
+        	else
+        	{ 
+        		Thread.sleep(defaultUpdateTime);
+        	}
         }
+        catch( InterruptedException e ){
+        	System.out.println("Sleep interrupted");
+        }
+        */
         
         // increment sequence.
         sequence++;
+        // lastCheck = System.currentTimeMillis();
                 
         // finally return a string 
         return xml.returnXML();
@@ -83,7 +114,6 @@ class SystemMonitor {
 
     private long lastCheck;
     private int sequence;
-    private long checkInterval;
 
 //---STATIC ATTRIBUTES---