Changeset 105 for trunk

Timestamp:

05/13/05 16:51:31 (18 years ago)

Author:

bastiaans

Message:

toga/toga-functions.php:

• Job and Node relations

File:

• trunk/web/addons/toga/toga-functions.php (modified) (11 diffs)

trunk/web/addons/toga/toga-functions.php

@@ -66 +66 @@
 class DataGatherer {
 
-        var $xmlhandler, $data;
+        var $xmlhandler, $data, $httpvars;
 
         function DataGatherer() {
@@ -72 +72 @@
                 $this->parser = xml_parser_create();
                 $this->source = new DataSource();
+                $this->httpvars = new HTTPVariables();
                 $this->xmlhandler = new TorqueXMLHandler();
                 xml_set_element_handler( $this->parser, array( &$this->xmlhandler, 'startElement' ), array( &$this->xmlhandler, 'stopElement' ) );
@@ -87 +88 @@
         }
 
+        function printInfo() {
+                $handler = $this->xmlhandler;
+                $handler->printInfo();
+        }
+
 }
 
 class TorqueXMLHandler {
 
-        var $clusters, $heartbeat;
+        var $clusters, $heartbeat, $nodes, $jobs;
 
         function TorqueXMLHandler() {
+                $jobs = array();
                 $clusters = array();
+                $nodes = array();
                 $heartbeat = array();
         }
 
+        function gotNode( $hostname, $jobid = null, $location = 'unspecified' ) {
+
+                $nodes = &$this->nodes;
+
+                if( !isset( $nodes[$hostname] ) ) {
+
+                        $nodes[$hostname] = new Node( $hostname );
+                }
+
+                if( $location != 'unspecified' ) {
+
+                        $nodes[$hostname]->setLocation( $location );
+                //} else {
+
+                        // Return pointer to this node if location was not set
+                        // Which means that this is for a jobinfo
+                        //$mynode = &$nodes[$hostname];
+                        //return $mynode;
+                }
+
+                if( $jobid ) {
+                        $nodes[$hostname]->addJob( $jobid );
+                }
+        }
+
         function startElement( $parser, $name, $attrs ) {
+
+                $jobs = &$this->jobs;
 
                 if ( $attrs[TN] ) {
@@ -107 +142 @@
                 }
 
-                $jobs = array();
                 $jobid = null;
 
                 // printf( '%s=%s', $attrs[NAME], $attrs[VAL] );
-
 
                 if( $name == 'CLUSTER' ) {
@@ -120 +153 @@
                                 $clusters[$clustername] = array();
 
+                } else if( $name == 'HOST' ) {
+
+                        $hostname = $attrs[NAME];
+                        $location = $attrs[LOCATION];
+
+                        $this->gotNode( $hostname, null,$location );
+
                 } else if( $name == 'METRIC' and strstr( $attrs[NAME], 'TOGA' ) ) {
 
@@ -144 +184 @@
                                         $togavalue = $togavalues[1];
 
-                                        printf( "toganame %s, togavalue %s\n", $toganame, $togavalue );
+                                        printf( "\t%s\t= %s\n", $toganame, $togavalue );
 
                                         if( $toganame == 'nodes' ) {
 
                                                 if( !isset( $jobs[$toganame] ) )
-                                                        $jobs[$toganame] = array();
+                                                        $jobs[$jobid][$toganame] = array();
 
                                                 $nodes = explode( ';', $togavalue );
@@ -155 +195 @@
                                                 foreach( $nodes as $node ) {
 
-                                                        printf( "node %s\n", $node );
-                                                        $jobs[$toganame][] = new Node( $node );
+                                                        // printf( "node %s\n", $node );
+
+                                                        $hostname = $node.'.'.$jobs[$jobid][domain];
+                                                        $jobs[$jobid][$toganame][] = $hostname;
+                                                        $this->gotNode( $hostname, $jobid );
+
+                                                        //$jobs[$jobid][$toganame][$hostname] = $this->gotNode( $hostname );
+                                                        // $jobs[$toganame][$node] = new Node( $node );
                                                 }
 
                                         } else {
 
-                                                $jobs[$toganame] = $togavalue;
+                                                $jobs[$jobid][$toganame] = $togavalue;
 
                                         }
@@ -171 +217 @@
         function stopElement( $parser, $name ) {
         }
+
+        function printInfo() {
+
+                $jobs = &$this->jobs;
+
+                printf( "---jobs---\n" );
+
+                foreach( $jobs as $jobid => $job ) {
+
+                        printf( "job %s\n", $jobid );
+
+                        if( isset( $job[nodes] ) ) {
+
+                                foreach( $job[nodes] as $node ) {
+
+                                        $mynode = $this->nodes[$node];
+                                        $hostname = $mynode->getHostname();
+                                        $location = $mynode->getLocation();
+
+                                        printf( "\t- node %s\tlocation %s\n", $hostname, $location );
+                                        //$this->nodes[$hostname]->setLocation( "hier draait job ".$jobid );
+                                }
+                        }
+                }
+
+                printf( "---nodes---\n" );
+
+                $nodes = &$this->nodes;
+
+                foreach( $nodes as $node ) {
+
+                        $hostname = $node->getHostname();
+                        $location = $node->getLocation();
+                        $jobs = implode( ' ', $node->getJobs() );
+                        printf( "* node %s\tlocation %s\tjobs %s\n", $hostname, $location, $jobs );
+                }
+        }
 }
 
 class Node {
 
-        var $img, $hostname, $location;
+        var $img, $hostname, $location, $jobs;
 
         function Node( $hostname ) {
@@ -181 +264 @@
                 $this->hostname = $hostname;
                 $this->img = new NodeImg();
+                $this->jobs = array();
+        }
+
+        function addJob( $jobid ) {
+                $jobs = &$this->jobs;
+
+                $jobs[] = $jobid;
         }
 
@@ -187 +277 @@
         }
 
+        function setHostname( $hostname ) {
+                $this->hostname = $hostname;
+        }
+
         function setCpus( $cpus ) {
                 $this->cpus = $cpus;
+        }
+
+        function getHostname() {
+                return $this->hostname;
+        }
+
+        function getLocation() {
+                return $this->location;
+        }
+
+        function getCpus() {
+                return $this->cpus;
+        }
+
+        function getJobs() {
+                return $this->jobs;
         }
 }
@@ -247 +357 @@
 $my_data = new DataGatherer();
 $my_data->parseXML();
+$my_data->printInfo();
+$my_data->printInfo();
 ?>
 </PRE>