Changeset 329

Timestamp:

04/22/07 15:36:26 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added SORTBY_HOSTNAME, SORT_ORDER, SORT_XLABEL, SORT_YLABEL

web/addons/job_monarch/image.php:

• removed debug statement

web/addons/job_monarch/libtoga.php:

• added x, y sorting if SORTBY_HOSTNAME is set
• added array_rem to remove value from array
• added cmp function for sorting of nodes according to SORTBY_HOSTNAME x, y setting

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (2 diffs)
• image.php (modified) (1 diff)
• libtoga.php (modified) (6 diffs)

trunk/web/addons/job_monarch/conf.php

@@ -1 +1 @@
 <?php
+
+// Sort nodes in clusterimage by
+//
+$SORTBY_HOSTNAME = "gb-r{x}n{y}.irc.sara.nl";
+$SORT_ORDER = "asc";
+
+$SORT_XLABEL = "rack";
+$SORT_YLABEL = "node";
+
 // Show hosts in a jobview by default?
 //
@@ -40 +49 @@
 // (250 pixels is same width as Ganglia's pie chart)
 //
-$BIG_CLUSTERIMAGE_MAXWIDTH = 250;
+$BIG_CLUSTERIMAGE_MAXWIDTH = 450;
 
 // The size of a single node in the small clusterimage

trunk/web/addons/job_monarch/image.php

@@ -45 +45 @@
                 $myxml_data     = $ds->getData();
 
-                print_f( "%s\n", $myxml_data );
+                //print_f( "%s\n", $myxml_data );
         }
         return $myxml_data;

trunk/web/addons/job_monarch/libtoga.php

@@ -77 +77 @@
 global $JOB_ARCHIVE_DIR;
 global $JOB_ARCHIVE_DBASE;
+global $SORTBY_HOSTNAME;
+global $SORT_ORDER;
+global $skan_str;
+global $x_first, $y_first;
 
 $my_dir = getcwd();
@@ -1053 +1057 @@
                 global $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH;
                 global $BIG_CLUSTERIMAGE_MAXWIDTH, $BIG_CLUSTERIMAGE_NODEWIDTH;
+
+                global $SORTBY_HOSTNAME, $SORT_ORDER, $skan_str;
+                global $x_first, $y_first;
         
                 $mydatag = $this->dataget;
@@ -1092 +1099 @@
                 $y_offset       = 0;
                 $font           = 2;
+                $fontwidth      = ImageFontWidth( $font );
                 $fontheight     = ImageFontHeight( $font );
                 $fontspaceing   = 2;
@@ -1099 +1107 @@
                 $this->height   = ($y_offset + (($node_rows*$node_width)+1) );
 
-                $image = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
-                $colorwhite = imageColorAllocate( $image, 255, 255, 255 );
-                imageFill( $image, 0, 0, $colorwhite );
-
-                if( $this->isSmall() ) {
-
-                        $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
-
-                        imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
-                }
+                //$image = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                //$colorwhite = imageColorAllocate( $image, 255, 255, 255 );
+                //imageFill( $image, 0, 0, $colorwhite );
+
+                //if( $this->isSmall() ) {
+
+                //      $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+                //      imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
+                //}
 
                 $jobs = $mydatag->getJobs();
@@ -1116 +1124 @@
                 //print_r($filtered_nodes);
 
-                for( $n = 0; $n < $node_rows; $n++ ) {
+                if( $SORTBY_HOSTNAME != "" )
+                {
+
+                        $sorted         = array();
+
+                        $x_first        = 0;
+                        $y_first        = 0;
+
+
+                        if( strpos( $SORTBY_HOSTNAME, "{x}" ) < strpos( $SORTBY_HOSTNAME, "{y}" ) )
+                        {
                         
-                        for( $m = 0; $m < $nodes_per_row; $m++ ) {
+                                $x_first        = 1;
+                        }
+                        else
+                        {
+                                $y_first        = 1;
+                
+                        }
+
+                        $skan_str       = str_replace( "{x}", "%d", $SORTBY_HOSTNAME );
+                        $skan_str       = str_replace( "{y}", "%d", $skan_str );
+
+                        $x_min          = null;
+                        $x_max          = null;
+                        $y_min          = null;
+                        $y_max          = null;
+
+                        foreach( $nodes as $hostname => $node )
+                        {
+                                //$n    = sscanf( $hostname, $skan_str, $i, $j );
+                                if( $x_first )
+                                {
+                                        $n = sscanf( $hostname, $skan_str, $x, $y );
+                                }
+                                else if( $y_first )
+                                {
+                                        $n = sscanf( $hostname, $skan_str, $y, $x );
+                                }
+
+                                //printf( "n %s\n", $n );
+
+                                // Remove nodes that don't match
+                                //
+                                if( $n < 2 )
+                                {
+                                        unset( $nodes[$hostname] );
+                                }
+
+                                if( !$x_min )
+                                {
+                                        $x_min  = $x;
+                                }
+                                else if( $x < $x_min )
+                                {
+                                        $x_min  = $x;
+                                }
+                                if( !$x_max )
+                                {
+                                        $x_max  = $x;
+                                }
+                                else if( $x > $x_max )
+                                {
+                                        $x_max  = $x;
+                                }
+                                if( !$y_min )
+                                {
+                                        $y_min  = $y;
+                                }
+                                else if( $y < $y_min )
+                                {
+                                        $y_min  = $y;
+                                }
+                                if( !$y_max )
+                                {
+                                        $y_max  = $y;
+                                }
+                                else if( $y > $y_max )
+                                {
+                                        $y_max  = $y;
+                                }
+                        }
+
+                        //printf( "ss %s\n", $skan_str);
+                        $sorted_nodes   = usort( $nodes, "cmp" );
+
+                        $x_offset       = 0;
+                        $cur_node       = 0;
+
+                        //printf( "xmin %s xmax %s\n", $x_min, $x_max );
+                        //printf( "ymin %s ymax %s\n", $y_min, $y_max );
+
+                        // werkt
+                        //print_r( $nodes );
+
+                        $image          = imageCreateTrueColor( $this->width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        $colorwhite     = imageColorAllocate( $image, 255, 255, 255 );
+
+                        imageFill( $image, 0, 0, $colorwhite );
+
+                        //if( $this->isSmall() ) {
+
+                        //      $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+                        //      imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
+                        //}
+
+                        for( $n = $x_min; $n <= $x_max; $n++ )
+                        {
+                                for( $m = $y_min; $m <= $y_max; $m++ )
+                                {
+                                        if( $x_min > 0 )
+                                        {
+                                                $x      = $x_offset + ( ($n-$x_min) * $node_width );
+                                        }
+                                        if( $y_min > 0 )
+                                        {
+                                                $y      = $y_offset + ( ($m-$y_min) * $node_width );
+                                        }
+
+                                        if( isset( $nodes[$cur_node] ) ) {
+
+
+                                                $host   = $nodes[$cur_node]->getHostname();
+
+                                                if( $x_first )
+                                                {
+                                                        $nn = sscanf( $host, $skan_str, $rx, $ry );
+                                                }
+                                                else if( $y_first )
+                                                {
+                                                        $nn = sscanf( $host, $skan_str, $ry, $rx );
+                                                }
+                                                if ( $nn < 2 )
+                                                {
+                                                        continue;
+                                                }
+                                                if( ( $rx - $x_min ) > $n )
+                                                {
+                                                        $m      = $y_max;
+                                                        continue;
+                                                }
+
+                                                if( !in_array( $host, $filtered_nodes ) )
+                                                        $nodes[$cur_node]->setShowinfo( 0 );
+
+                                                $nodes[$cur_node]->setCoords( $x, $y );
+                                                $nodes[$cur_node]->setImage( $image );
+
+                                                //print_r( $nodes[$cur_node] );
+
+                                                if( $this->isSmall() )
+                                                        $nodes[$cur_node]->drawSmall();
+                                                else if( $this->isBig() )
+                                                        $nodes[$cur_node]->drawBig();
+                                        }
+                                        $cur_node++;
+                                }
+                        }
+
+                }
+                else
+                {
+                        $image          = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        $colorwhite     = imageColorAllocate( $image, 255, 255, 255 );
+
+                        imageFill( $image, 0, 0, $colorwhite );
+
+                        if( $this->isSmall() ) {
+
+                                $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+                                imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
+                        }
+
+                        for( $n = 0; $n < $node_rows; $n++ ) {
                         
-                                $x = ($m * $node_width);
-                                $y = $y_offset + ($n * $node_width);
-
-                                $cur_node = ($n * $nodes_per_row) + ($m);
-                                $host = $nodes_hosts[$cur_node];
-
-                                if( isset( $nodes[$host] ) ) {
-
-                                        $nodes[$host]->setCoords( $x, $y );
-                                        $nodes[$host]->setImage( $image );
-
-                                        if( !in_array( $host, $filtered_nodes ) )
-                                                $nodes[$host]->setShowinfo( 0 );
-
-                                        if( $this->isSmall() )
-                                                $nodes[$host]->drawSmall();
-                                        else if( $this->isBig() )
-                                                $nodes[$host]->drawBig();
+                                for( $m = 0; $m < $nodes_per_row; $m++ ) {
+                        
+                                        $x = ($m * $node_width);
+                                        $y = $y_offset + ($n * $node_width);
+
+                                        $cur_node = ($n * $nodes_per_row) + ($m);
+                                        $host = $nodes_hosts[$cur_node];
+
+                                        if( isset( $nodes[$host] ) ) {
+
+                                                $nodes[$host]->setCoords( $x, $y );
+                                                $nodes[$host]->setImage( $image );
+
+                                                if( !in_array( $host, $filtered_nodes ) )
+                                                        $nodes[$host]->setShowinfo( 0 );
+
+                                                if( $this->isSmall() )
+                                                        $nodes[$host]->drawSmall();
+                                                else if( $this->isBig() )
+                                                        $nodes[$host]->drawBig();
+                                        }
                                 }
                         }
@@ -1349 +1533 @@
 }
 
+function array_rem( $val, &$arr )
+{
+        // Delete val from arr
+        //
+        $i      = array_search( $val, $arr );
+
+        if( $i == false ) return false;
+
+        $arr    = array_merge( array_slice( $arr, 0, $i ), array_slice( $arr, $i+1, count( $arr ) ) );
+
+        return true;
+}
+
+function cmp( $a, $b ) 
+{
+        global $SORT_ORDER;
+        global $skan_str;
+        global $x_first, $y_first;
+
+        $a_node         = $a;
+        $b_node         = $b;
+        $a              = $a_node->getHostname();
+        $b              = $b_node->getHostname();
+
+        if( $a == $b ) return 0;
+
+        if( $x_first )
+        {
+                $n = sscanf( $a, $skan_str, $a_x, $a_y );
+                $n = sscanf( $b, $skan_str, $b_x, $b_y );
+        }
+        else if( $y_first )
+        {
+                $n = sscanf( $a, $skan_str, $a_y, $a_x );
+                $n = sscanf( $b, $skan_str, $b_y, $b_x );
+        }
+
+        if ( $SORT_ORDER=="desc" )
+        {
+
+                // 1  = a < b
+                // -1 = a > b
+                //
+                if ($a_x == $b_x)
+                {
+                        if ($a_y < $b_y)
+                        {
+                                return 1;
+                        }
+                        else if ($a_y > $b_y)
+                        {
+                                return -1;
+                        }
+                }
+                else if ($a_x < $b_x)
+                {
+                        return 1;
+                }
+                else if ($a_x > $b_x)
+                {
+                        return -1;
+                }
+        }
+        else if ( $SORT_ORDER == "asc" )
+        {
+
+                // 1  = a > b
+                // -1 = a < b
+                //
+                if ($a_x == $b_x)
+                {
+                        if ($a_y > $b_y)
+                        {
+                                return 1;
+                        }
+                        else if ($a_y < $b_y)
+                        {
+                                return -1;
+                        }
+                }
+                else if ($a_x > $b_x)
+                {
+                        return 1;
+                }
+                else if ($a_x < $b_x)
+                {
+                        return -1;
+                }
+        }
+}
 function makeTime( $time ) {