Changeset 123 for trunk

Timestamp:

06/02/05 10:43:09 (18 years ago)

Author:

bastiaans

Message:

toga/overview.php:

• Fixed piechart percentage calculation for jobs
• Now a job has a certain 'weight' on a node depending on how much jobs are running there

File:

• trunk/web/addons/toga/overview.php (modified) (3 diffs)

trunk/web/addons/toga/overview.php

@@ -183 +183 @@
         $emptynodes = 0;
 
+        $job_weight = array();
+
         foreach( $nodes as $node ) {
 
@@ -189 +191 @@
                 if( count( $myjobs ) == 0 )
                         $emptynodes++;
-                else
-                        $nodes_jobs = $nodes_jobs + count( $myjobs );
-        }
+        }
+        $used_nodes = $nr_nodes - $emptynodes;
 
         $empty_percentage = ($emptynodes / $nr_nodes) * 100;
@@ -200 +201 @@
         $pie_args .= "&free=$empty_percentage,$color";
 
-        foreach( $jobs as $jobid => $jobattrs ) {
-
-                $qname = $jobattrs[queue];
-
-                if( !array_search( $qname, $queues ) ) {
+        foreach( $nodes as $node ) {
+
+                $node_jobs = $node->getJobs();
+                $nr_node_jobs = count( $node_jobs );
+                $myhost = $node->getHostname();
+
+                foreach( $node_jobs as $myjob ) {
+
+                        // Determine the weight of this job on the node it is running
+                        // - what percentage of the node is in use by this job
+                        //
+                        $job_weight[$myjob] = ( 100 / count( $node_jobs ) ) / 100;
+                        $qname = $jobs[$myjob][queue];
 
                         if( !isset( $queues[$qname] ) )
-                                $queues[$qname] = array();
-
-                        $queues[$qname][] = $jobid;
+                                $queues[$qname] = $job_weight[$myjob];
+                        else
+                                $queues[$qname] = $queues[$qname] + $job_weight[$myjob];
                 }
         }
 
         $qcolors = array();
-        foreach( $queues as $queue => $myjobs ) {
-
-                $qjobs = count ( $myjobs );
-                $percentage = ( $qjobs / $nr_jobs ) * $job_percentage;
+        foreach( $queues as $queue => $totalweight) {
+
+                $percentage = ( $totalweight / $used_nodes ) * $job_percentage;
+                
                 $color = randomColor( $qcolors );
                 $qcolors[] = $color;