Changeset 110 for trunk/web

Timestamp:

05/20/05 15:32:17 (19 years ago)

Author:

bastiaans

Message:

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

Renamed -> libtoga.php

web/addons/toga/libtoga.php:

new toga-functions.php:

• Now nodes are correctly marked in clusterimage with a 'j' for single processor jobs and a 'J' for multi processor jobs

web/addons/toga/image.php:

• Script for generating images

web/addons/toga/conf.php:

• Configuration for web frontend

web/templates/toga/cluster_extra.tpl:

• Plugin html template for ganglia

client:

• Leftover removal from first tree
• This is named 'plugin' atm

Location:

trunk/web

Files:

• addons/toga/conf.php (added)
• addons/toga/image.php (added)
• addons/toga/libtoga.php (moved) (moved from trunk/web/addons/toga/toga-functions.php) (15 diffs)
• templates/toga/cluster_extra.tpl (added)

trunk/web/addons/toga/libtoga.php

@@ -1 +1 @@
 <?php
-$GANGLIA_PATH = "/var/www/ganglia";
+//$GANGLIA_PATH = "/var/www/ganglia";
+
+// Toga's conf
+//
+include_once "./conf.php";
+
+global $GANGLIA_PATH, $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH, $DATA_SOURCE;
+
+//printf("gpath %s clmaxw %s ndmaxw %s ds %s",$GANGLIA_PATH, $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH, $DATA_SOURCE); 
 
 include_once "$GANGLIA_PATH/conf.php";
@@ -29 +37 @@
 
         var $clustername, $metricname;
+        var $restvars;
 
         function HTTPVariables() {
+
+                $this->restvars = array();
 
                 global $HTTP_GET_VARS;
@@ -36 +47 @@
                 $this->clustername = $HTTP_GET_VARS["c"] ? $HTTP_GET_VARS["c"] : null;
                 $this->metricname = $HTTP_GET_VARS["m"] ? $HTTP_GET_VARS["m"] : null;
+
+                foreach( $HTTP_GET_VARS as $httpvar => $httpval ) {
+                        
+                        if( $httpval ) {
+                                $this->restvars[$httpvar] = $httpval;
+                        }
+                }
         }
 
@@ -44 +62 @@
         function getMetricName() {
                 return $this->metricname;
+        }
+
+        function getHttpVar( $var ) {
+                if( isset( $this->restvars[$var] ) )
+                        return $retval;
+                else
+                        return null;
         }
 }
@@ -86 +111 @@
         function DataGatherer() {
 
+                global $DATA_SOURCE;
+                
+                $ds_fields = explode( ':', $DATA_SOURCE );
+                $ds_ip = $ds_fields[0];
+                $ds_port = $ds_fields[1];
+
+                $this->source = new DataSource( $ds_ip, $ds_port );
+
                 $this->parser = xml_parser_create();
-                $this->source = new DataSource();
                 $this->httpvars = new HTTPVariables();
                 $this->xmlhandler = new TorqueXMLHandler();
@@ -132 +164 @@
         }
 
-        function gotNode( $hostname, $location = 'unspecified', $jobid = null ) {
+        function gotNode( $hostname, $location = 'unspecified', $jobid ) {
 
                 $nodes = &$this->nodes;
@@ -148 +180 @@
                 if( $jobid ) {
                         $nodes[$hostname]->addJob( $jobid );
+                        //printf("add job %s to node %s", $jobid, $hostname );
                 }
         }
@@ -218 +251 @@
                                                         $jobs[$jobid][$toganame][] = $hostname;
                                                         $this->gotNode( $hostname, null, $jobid );
+                                                        //printf( "got job %s on node %s", $jobid, $hostname );
                                                 }
 
@@ -294 +328 @@
 
                 $jobs[] = $jobid;
+                //print_r( $jobs );
+                $this->jobs = $jobs;
         }
 
@@ -321 +357 @@
 
         function getJobs() {
+                //print_r( $this->jobs );
                 return $this->jobs;
         }
@@ -351 +388 @@
 class NodeImage {
 
-        var $image, $x, $y, $hostname;
-
-        function NodeImage( $image, $x, $y ) {
+        var $image, $x, $y, $hostname, $jobs;
+
+        function NodeImage( $image, $x, $y, $hostname, $multiproc_job ) {
 
                 $this->image = $image;
                 $this->x = $x;
                 $this->y = $y;
+                $this->hostname = $hostname;
+                $this->multiproc_job = $multiproc_job;
         }
 
@@ -386 +425 @@
 
         function drawNode( $load ) {
+
+                global $SMALL_CLUSTERIMAGE_NODEWIDTH;
 
                 if( !isset( $this->x ) or !isset( $this->y ) or !isset( $load ) ) {
@@ -393 +434 @@
                 }
 
-                $queue_color = imageColorAllocate( &$this->image, 0, 102, 304 );
-                $job_color = imageColorAllocate( &$this->image, 204, 204, 0 );
+                $black_color = imageColorAllocate( &$this->image, 0, 0, 0 );
 
                 // Convert Ganglias Hexadecimal load color to a Decimal one
                 $my_loadcolor = $this->colorHex( load_color($load) );
 
-                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 );
+                $size = $SMALL_CLUSTERIMAGE_NODEWIDTH;
+
+                imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size), $this->y+($size), $black_color );
+                imageFilledRectangle( $this->image, $this->x+1, $this->y+1, $this->x+($size-1), $this->y+($size-1), $my_loadcolor );
+                if( $this->multiproc_job == 2 )
+                        imageString( $this->image, 1, $this->x+(($size/2)-2), $this->y+(($size/2)-3), "J", $black_color );
+                else if( $this->multiproc_job == 1 )
+                        imageString( $this->image, 1, $this->x+(($size/2)-2), $this->y+(($size/2)-3), "j", $black_color );
 
                 // Een job markering?
@@ -429 +475 @@
 
         function draw() {
+
+                global $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH;
+        
                 $mydatag = $this->dataget;
                 $mydatag->parseXML();
 
-                $max_width = 250;
-                $node_width = 11;
+                //$max_width = 250;
+                //$node_width = 11;
+
+                $max_width = $SMALL_CLUSTERIMAGE_MAXWIDTH;
+                $node_width = $SMALL_CLUSTERIMAGE_NODEWIDTH;
+
+                //printf( "cmaxw %s nmaxw %s", $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH );
 
                 $nodes = $mydatag->getNodes();
@@ -479 +533 @@
                                 if( isset( $nodes[$host] ) and ($cur_node < $nodes_nr) ) {
                                         //printf( "image %s\n", $host );
-                                        $node = new NodeImage( $image, $x, $y );
-                                        $node->setHostname( $host );
+                                        $nodejobs = $nodes[$host]->getJobs();
+                                        $jobs = $mydatag->getJobs();
+
+                                        $multiproc_job = 0;
+
+                                        if( count( $nodejobs ) > 0 ) {
+                                                $multiproc_job = 1;
+
+                                                foreach( $nodejobs as $myjob ){
+                                                        if( isset($jobs[$myjob]['ppn']) and $jobs[$myjob]['ppn'] > 1 )
+                                                                $multiproc_job = 2;
+                                                                break;
+                                                }
+                                        }
+
+                                        //printf( "jobs %s node %s", $nrjobs, $host );
+                                        $node = new NodeImage( $image, $x, $y, $host, $multiproc_job );
+                                        //$node->setHostname( $host );
                                         $node->draw();
                                         //$nodes[$host]->setCoords( $x, $y );