--- projects/cms/source/host/java/SystemMonitor.java	2000/11/27 19:44:32	1.1
+++ projects/cms/source/host/java/SystemMonitor.java	2000/12/07 23:21:13	1.6
@@ -1,52 +1,116 @@
+//---PACKAGE DECLARATION---
+
+//---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
+ * then packages these up using XMLFormatter and outputs them if
+ * the timeout has passed.
+ *
+ * @author  $Author: tdb $
+ * @version $Id: SystemMonitor.java,v 1.6 2000/12/07 23:21:13 tdb Exp $
+ */
 class SystemMonitor {
 
-	public SystemMonitor( Config config ){
-		// create a new instace, get the info we need out of config
-		// like things to monitor
-		
-		lastCheck = System.currentTimeMillis();
-		sequence = 0;
+//---FINAL ATTRIBUTES---
 
+//---STATIC METHODS---
 
-		// 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"));
-		
-	}
+//---CONSTRUCTORS---
 
-	public String getInfo(){
-		// called to retrieve the stored averages and output them as a XML string
-		XMLFormatter xml = new XMLFormatter("packet");
-		
-		// 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.	    
-		}
-		
-		// increment sequence.
-		sequence++;
-				
-		// finally return a string 
-		return xml.returnXML();
-	} // getinfo()
+/**
+ * Public constructor for the class. Takes in a Config object to gain its
+ * properties from.
+ *
+ */   
+ public SystemMonitor( Config config ){
+        // create a new instace, get the info we need out of config
+        // like things to monitor
+        
+        lastCheck = System.currentTimeMillis();
+        sequence = 1;
 
-    // last time the system data was returned.
+
+        // why oh why wont ultra edit let me put Long in the next line? oh its trying to 
+        // correct keywords =|
+        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---
+
+   /**
+    * Gathers system information and will black until the timeout has passed.
+    *
+    * @return the system information in an XML packet
+    */
+    public String getInfo(){
+        // called to retrieve the stored averages and output them as a XML string
+        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());
+        
+        
+        // MUST FIX THIS..!!!!
+        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();
+    } // getinfo()
+    
+//---PRIVATE METHODS---
+
+//---ACCESSOR/MUTATOR METHODS---
+
+//---ATTRIBUTES---
+
     private long lastCheck;
     private int sequence;
-    private long checkInterval;
+    private long udpcheckInterval;
+    private final long defaultUpdateTime = 60000;
+
+//---STATIC ATTRIBUTES---
 
 } // class
\ No newline at end of file