Changeset 743 for branches/0.4/web

Timestamp:

03/25/13 12:52:33 (10 years ago)

Author:

ramonb

Message:

libtoga.php:

• allow jobs and nodes to be set externally for ClusterImage?
• ONLY parse XML if jobs and nodes not set externally

overview.php:

• setJobs and setNodes on ClutserImage? (map) to prevent XML parsing
• major speedup

Location:

branches/0.4/web/addons/job_monarch

Files:

• libtoga.php (modified) (6 diffs)
• overview.php (modified) (2 diffs)

branches/0.4/web/addons/job_monarch/libtoga.php

@@ -1311 +1311 @@
         $this->height        = 0;
         $this->output        = 1;
+        $this->jobs         = null;
+        $this->nodes        = null;
     }
 
@@ -1333 +1335 @@
         $this->output    = 0;
     }
+    function setJobs($jobs )
+    {
+        $this->jobs     = &$jobs;
+    }
+    function getJobs()
+    {
+        if( $this->jobs == null )
+        {
+            $mydatag = $this->dataget;
+            $mydatag->parseXML( $this->data );
+            $this->jobs = $mydatag->getJobs();
+        }
+
+        return $this->jobs;
+    }
+    function getNodes()
+    {
+        if( $this->nodes== null )
+        {
+            $mydatag = $this->dataget;
+            $mydatag->parseXML( $this->data );
+            $this->nodes = $mydatag->getNodes();
+        }
+
+        return $this->nodes;
+    }
+    function setNodes($nodes)
+    {
+        $this->nodes    = &$nodes;
+    }
     function isSmall()
     {
@@ -1349 +1381 @@
     {
         $filtered_nodes = array();
+
+        //print_r( $nodes );
 
         foreach( $nodes as $node )
@@ -1415 +1449 @@
         }
 
-        $mydatag = $this->dataget;
-        $mydatag->parseXML( $this->data );
-
         if( $this->isSmall() )
         {
@@ -1429 +1460 @@
         }
 
-        $nodes        = $mydatag->getNodes();
+        $nodes        = $this->getNodes();
         $nodes_hosts    = array_keys( $nodes );
 
@@ -1468 +1499 @@
         $this->height    = ($y_offset + (($node_rows*$node_width)+1) );
 
-        $jobs = $mydatag->getJobs();
+        $jobs = $this->getJobs();
         $filtered_nodes = $this->filterNodes( $jobs, $nodes );
 

branches/0.4/web/addons/job_monarch/overview.php

@@ -47 +47 @@
 $use_fqdn  = $data_gatherer->getUsingFQDN();
 
+//print_r( $gnodes );
+
 function setupFilterSettings() 
 {
@@ -70 +72 @@
     $ic = new ClusterImage( $myxml_data, $clustername );
 
+    $ic->setJobs( $data_gatherer->getJobs() );
+    $ic->setNodes( $data_gatherer->getNodes() );
     $ic->setBig();
     $ic->setNoimage();