Changeset 836 for branches/1.0/web

Timestamp:

04/24/13 15:50:30 (11 years ago)

Author:

ramonb

Message:

libtoga.php:

• calculate parsetime

templates/footer.tpl:

• made parsetime optional

index.php:

• don't show parsetime for archive: not applicable

overview.php:

• assign parsetime
• closes #161

Location:

branches/1.0/web/addons/job_monarch

Files:

• index.php (modified) (2 diffs)
• libtoga.php (modified) (3 diffs)
• overview.php (modified) (1 diff)
• templates/footer.tpl (modified) (1 diff)

branches/1.0/web/addons/job_monarch/index.php

@@ -435 +435 @@
 function makeFooter() 
 {
-    global $dwoo, $version, $parsetime, $monarchversion;
+    global $dwoo, $version, $parsetime, $monarchversion, $view;
 
     $tpl = new Dwoo_Template_File("templates/footer.tpl");
@@ -454 +454 @@
     }
 
-    $tpl_data->assign("parsetime", sprintf("%.4f", $parsetime) . "s");
+    if( isset( $parsetime ) && ($view !== "search" ) )
+    {
+        $tpl_data->assign("showparsetime", "yes" );
+        $tpl_data->assign("parsetime", sprintf("%.4f", $parsetime) . "s");
+    }
 
     $dwoo->output($tpl, $tpl_data);

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

@@ -564 +564 @@
     function DataGatherer( $cluster )
     {
-        $this->cluster    = $cluster;
-        $this->httpvars = $httpvars;
+        $this->cluster   = $cluster;
+        $this->httpvars  = $httpvars;
+        $this->parsetime = 0;
     }
 
@@ -574 +575 @@
         $this->xmlhandler     = new TorqueXMLHandler( $this->cluster );
 
+        $start = gettimeofday();
+
         xml_parser_set_option( $this->parser, XML_OPTION_CASE_FOLDING, 0 );
         xml_set_element_handler( $this->parser, array( &$this->xmlhandler, 'startElement' ), array( &$this->xmlhandler, 'stopElement' ) );
@@ -583 +586 @@
         $handler = &$this->xmlhandler;
         $handler->finishUp();
+
+        $end = gettimeofday();
+
+        $this->parsetime = ($end['sec'] + $end['usec']/1e6) - ($start['sec'] + $start['usec']/1e6);
     }
 

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

@@ -50 +50 @@
 $data_gatherer->parseXML( $myxml_data );
 
+$parsetime = $data_gatherer->parsetime;
 $heartbeat = $data_gatherer->getHeartbeat();
 $jobs      = $data_gatherer->getJobs();

branches/1.0/web/addons/job_monarch/templates/footer.tpl

@@ -7 +7 @@
 Ganglia web version {$webfrontendversion}<BR>
 
+{if "$showparsetime" == "yes"}
 Downloading and parsing ganglia's XML tree took {$parsetime}.<BR>
+{/if}
 Images created with <A HREF="http://www.rrdtool.org/">RRDTool</A>.<BR>
 </FONT>