Changeset 714 for branches/0.4/web/addons

Timestamp:

03/21/13 21:25:19 (11 years ago)

Author:

ramonb

Message:

• more cleanup

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (9 diffs)
• image.php (modified) (3 diffs)
• index.php (modified) (9 diffs)
• overview.php (modified) (7 diffs)

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

@@ -32 +32 @@
 }
 
-//printf( "st%s\n", $st);
 $sourcetime = $st;
-//printf( "st%s\n", $sourcetime);
-
-//printf( "%s\n", $rrds );
-//printf( "r%s\n", $range);
-//printf( "s %s\n", $start);
-//printf( "e %s\n", $end);
 
 # Graph specific variables
@@ -51 +44 @@
 $load_color = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["l"] ));
 $vlabel = escapeshellcmd( rawurldecode( $HTTP_GET_VARS["vl"] ));
-//$sourcetime = escapeshellcmd($HTTP_GET_VARS["st"]);
 
 $cluster = $c;
@@ -73 +65 @@
 }
 
-//printf( "cluster = %s hostname = %s metric = %s\n", $cluster, $hostname, $metricname );
-
 $trd = new TarchRrdGraph( $cluster, $hostname );
-//$rrd_files = $trd->getRrdFiles( $metricname, $start, $stop );
-
-//print_r( $rrd_files );
 
 $graph = $metricname;
@@ -92 +79 @@
 
                 $style = "CPU";
-                //printf("ik doe die shit!\n");
 
                 $upper_limit = "--upper-limit 100 --rigid";
@@ -140 +126 @@
                 $style = "Jobs";
 
-                //$upper_limit = "--upper-limit 100 --rigid";
                 $lower_limit = "--lower-limit 0 --rigid";
                 $vertical_label = "--vertical-label Jobs";
@@ -164 +149 @@
                 $sorted_hosts   = array();
                 $sorted_hosts[] = $rjqj_host;
-
-                //printf( "rjqjh %s\n", $rjqj_host);
-
-                //printf( "rrdd %s\n", $rrd_dir );
 
                 $rj_str = ":'Running Jobs'";
@@ -339 +320 @@
                 }
 
-                //if ($range=="job") {
-                //      $hrs = intval( -$jobrange / 3600 );
-                //      $subtitle = "$prefix last ${hrs}h (now $value)";
-                //} else
-                //      $subtitle = "$prefix last $range (now $value)";
-
                 if (is_numeric($max))
                         $upper_limit = "--upper-limit '$max' ";
@@ -387 +362 @@
 }
 
-//$title = "$hostname $style $metricname";
 $title = "$hostname";
-
-//# Set the graph title.
-//if($context == "meta") {
-//      $title = "$self $meta_designator $style last $range";
-//} else if ($context == "grid") {
-//      $title = "$grid $meta_designator $style last $range";
-//} else if ($context == "cluster") {
-//      $title = "$clustername $style last $range";
-//} else {
-//      if ($size == "small") {
-//              # Value for this graph define a background color.
-//              if (!$load_color) $load_color = "ffffff";
-//                      $background = "--color BACK#'$load_color'";
-
-//              $title = $hostname;
-//      } else {
-//              if ($style)
-//                      $title = "$hostname $style last $range";
-//              else
-//                      $title = $metricname;
-//      }
-//}
 
 function determineXGrid( $p_start, $p_stop ) {
@@ -496 +448 @@
 if( isset($sourcetime) )
 {
-        //printf("yay");
-
         $end = $sourcetime;
         # Get_context makes start negative.

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

@@ -45 +45 @@
                 $myxml_data     = $ds->getData();
 
-                //print_f( "%s\n", $myxml_data );
         }
         return $myxml_data;
@@ -55 +54 @@
 $clustername = $httpvars->getClusterName();
 
-//printf("clustername = %s\n", $clustername );
 if( isset($id) && ($id!='')) $filter['id']=$id;
 if( isset($state) && ($state!='')) $filter['state']=$state;
@@ -112 +110 @@
         if( isset( $filter ) ) {
                 foreach( $filter as $filtername=>$filtervalue ) {
-                        //printf("filter %s,%s\n", $filtername, $filtervalue);
                         switch( $filtername ) {
 

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

@@ -37 +37 @@
 }
 
-//printf( "r2%s\n", $range );
 
 global $GANGLIA_PATH;
-//chdir( $GANGLIA_PATH );
 
 include_once "./class.TemplatePower.inc.php";
-//chdir( $my_dir );
 
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
@@ -86 +83 @@
         }
 }
-
-//if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
-//if( isset($state) && ($state!='')) $filter[state]=$state;
-//if( isset($user) && ($user!='')) $filter[user]=$user;
-//if( isset($id) && ($id!='')) $filter[id]=$id;
 
 function epochToDatetime( $epoch ) {
@@ -165 +157 @@
 
         $tpl->assign( "date", date("r") );
-        //printf("lg %s\n", $longtitle );
-        //printf("title %s\n", $title );
         $tpl->assign( "longpage_title", $longtitle );
         $tpl->assign( "page_title", $title );
@@ -228 +218 @@
         $context_metrics        = array();
 
-        //foreach ($mmfh as $mm => $mfoo)
         foreach( $mmfh as $mm => $bla )
         {
@@ -286 +275 @@
         }
 
-        //$m = $metricname;
-
-
         $tpl->gotoBlock( "_ROOT" );
         $tpl->assignGlobal("view", $view);
@@ -296 +282 @@
 
                 $range = "job";
-
-                //print_r( $context_metrics );
 
                 if( $page_call != "host_view" )
@@ -342 +326 @@
         }
 
-        //$ex_fn = $tpl->getVarValue( "_ROOT", "form_name" );
-
         if( $view != "search" )
         {
@@ -439 +421 @@
 if( isset( $h ) and $h != '' ) {
         $hostname = $h;
-        //$view = "host";
 }
 
@@ -470 +451 @@
 $longtitle = "Batch Report :: Powered by Job Monarch!";
 $title = "Batch Report";
-//makeHeader( 'index' );
 $tpl->assign("cluster_url", rawurlencode($clustername) );
 $tpl->assign("cluster", $clustername );

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

@@ -75 +75 @@
         $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&j_view=big-clusterimage".$filter_image_url );
 
-        //$tpl->assign( "clusterimage_width", $ic->getWidth() );
-        //$tpl->assign( "clusterimage_height", $ic->getHeight() );
-
         $tpl->newBlock( "node_clustermap" );
         $tpl->assign( "node_area_map", $ic->getImagemapArea() );
@@ -271 +268 @@
         $used_cpus              = $nr_cpus - $empty_cpus;
 
-        //$empty_percentage     = ($empty_cpus / $nr_cpus) * 100;
         $empty_percentage       = $empty_cpus;
 
@@ -380 +376 @@
         }
 
-        //$percentage   = 0;
-        //$slice_count  = 0;
-
-        // Find rounding errors: total has to be 100
-        //
-        //foreach( $graphvals as $name => $totalweight) 
-        //{
-        //      $percentage     = $percentage + $totalweight;
-        //      $slice_count    = $slice_count + 1;
-        //}
-
-        //$round_offset = ( 100 - $percentage ) / $slice_count;
-
         foreach( $graphvals as $name => $totalweight) 
         {
-                //$percentage   = ( $totalweight * 100 ) + $round_offset;
                 $percentage     = $totalweight;
                 
@@ -674 +656 @@
                                         if( isset( $hostname ) && $hostname != '' ) 
                                         {
-                                                //$filter[host] = $hostname;
-
                                                 $domain_len     = 0 - strlen( $jobs[$jobid]['domain'] );
                                                 $hostnode       = $tempnode;
@@ -880 +860 @@
                                 {
                                         $runningtime            = makeTime( $report_time - $start_time );
-                                        //$job_runningtime      = $report_time - $start_time;
                                         $job_runningtime        = $heartbeat - $start_time;
 
@@ -955 +934 @@
         }
 
-        //print_r( $metrics );
-
         global $longtitle, $title;
 
@@ -1011 +988 @@
                         $hosts_up       = $jobs[$filter['id']]['nodes'];
 
-                        //printf( "r %s\n", $job_runningtime );
-
                         $r              = intval($job_runningtime * 1.2);
 
-                        //$jobrange     = ($job_runningtime < 3600) ? -3600 : -$r ;
                         $jobrange       = -$r ;
-                        //$jobstart     = $report_time - $job_runningtime;
                         $jobstart       = $start_time;
-
-                        //printf( "jr %s\n", $jobrange );
-                        //printf( "js %s\n", $jobstart);
 
                         if ( $reports[$metricname] )