Changeset 109 for trunk

Timestamp:

05/20/05 09:48:26 (18 years ago)

Author:

bastiaans

Message:

toga/toga-functions.php:

• Load colors fixed
• Now all nodes are imaged in clusterimage (bug fixed in loop)

File:

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

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

@@ -6 +6 @@
 include_once "$GANGLIA_PATH/ganglia.php";
 
+// Set cluster context so that Ganglia will
+// provide us with the correct metrics array
+//
 global $context;
 $context = 'cluster';
@@ -11 +14 @@
 include_once "$GANGLIA_PATH/get_ganglia.php";
 
+// If php is compiled without globals
+//
 if ( !empty( $_GET ) ) {
         extract( $_GET );
 }
 
+// Ganglia's array of host metrics
+//
 global $metrics;
 
@@ -361 +368 @@
         function colorHex( $color ) {
         
-                $my_color = imageColorAllocate( $this->image, hexdec( substr( $color, 0, 2 )), hexdec( substr( $color, 2, 4 )), hexdec( substr( $color, 4, 6 )) );
+                $my_color = imageColorAllocate( $this->image, hexdec( substr( $color, 0, 2 )), hexdec( substr( $color, 2, 2 )), hexdec( substr( $color, 4, 2 )) );
 
                 return $my_color;
@@ -392 +399 @@
                 $my_loadcolor = $this->colorHex( load_color($load) );
 
-                imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+12, $this->y+12, $queuecolor );
-                imageFilledRectangle( $this->image, $this->x+2, $this->y+2, $this->x+10, $this->y+10, $my_loadcolor );
+                imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+11, $this->y+11, $queuecolor );
+                imageFilledRectangle( $this->image, $this->x+1, $this->y+1, $this->x+10, $this->y+10, $my_loadcolor );
 
                 // Een job markering?
@@ -407 +414 @@
                 $load_one = $metrics[$this->hostname][load_one][VAL];
                 $load = ((float) $load_one)/$cpus;
+                //printf( "hostname %s cpus %s load_one %s load %f\n", $this->hostname, $cpus, $load_one, $load );
 
                 $this->drawNode( $load );
@@ -425 +433 @@
 
                 $max_width = 250;
-                $node_width = 12;
+                $node_width = 11;
 
                 $nodes = $mydatag->getNodes();
@@ -453 +461 @@
 
                 //printf( "imagecreate: %dx%d", ($nodes_per_row*$node_width), ($node_rows*$node_width) );
-                $image = imageCreateTrueColor( ($nodes_per_row*$node_width), ($node_rows*$node_width) );
+                $image = imageCreateTrueColor( ($nodes_per_row*$node_width)+1, ($node_rows*$node_width)+1 );
                 $colorwhite = imageColorAllocate( $image, 255, 255, 255 );
                 imageFill( $image, 0, 0, $colorwhite );
@@ -464 +472 @@
                                 $y = ($n * $node_width);
 
-                                $cur_node = ($n * $nodes_per_row) + ($m + 1);
+                                $cur_node = ($n * $nodes_per_row) + ($m);
                                 $host = $node_keys[$cur_node];
 
-                                if( isset( $nodes[$host] ) and ($cur_node <= $nodes_nr) ) {
+                                //printf( "host %s curnode %s ", $host, $cur_node );
+
+                                if( isset( $nodes[$host] ) and ($cur_node < $nodes_nr) ) {
+                                        //printf( "image %s\n", $host );
                                         $node = new NodeImage( $image, $x, $y );
                                         $node->setHostname( $host );