Changeset 516

Timestamp:

03/08/08 21:32:55 (15 years ago)

Author:

bastiaans

Message:

overview.php:

• changed na_nodes/cpus counting to use nodes objects: shorter now

File:

• trunk/web/addons/job_monarch/overview.php (modified) (2 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -581 +581 @@
         $rjqj_host              = null;
 
-        $nodes_down             = null;
-        $nodes_offline          = null;
-
-        $replacestr = array();
-        $replacestr[] = "'";
-        $replacestr[] = " ";
-        
+        $na_nodes               = 0;
+        $na_cpus                = 0;
+
         foreach( $metrics as $bhost => $bmetric )
         {
@@ -596 +592 @@
                                 $rjqj_host      = $bhost;
                         }
-                        if( ( $mname == 'MONARCH-DOWN' ) )
-                        {
-                                $nodes_down = str_replace($replacestr,NULL,split(',',substr($mval['VAL'],1,-1)));
-                        }
-                        if( ( $mname == 'MONARCH-OFFLINE' ) )
-                        {
-                                $nodes_offline = str_replace($replacestr,NULL,split(',',substr($mval['VAL'],1,-1)));
-                        }
                 }
         }
 
-        $nodes_counted          = array();
-
-        if($nodes_down != NULL || $nodes_offline!=NULL )
-        {
-                foreach( $metrics as $bh => $bm )
+        foreach( $gnodes as $ghost => $gnode )
+        {
+                if( $gnode->isDown() || $gnode->isOffline() )
                 {
-                        if (in_array($bh,$nodes_offline) && $gnodes[$bh])
-                        {
-                                $nodes_counted[] = $bh;
-                                if(! $gnodes[$bh]->getJobs())
-                                {
-                                        $na_cpus += ($bm['cpu_num'][VAL]);
-                                        $na_nodes += 1;
-                                }
-                        }
-                        if (in_array($bh,$nodes_down) && !in_array($bh,$nodes_counted) && $gnodes[$bh])
-                        {
-                                $nodes_counted[] = $bh;
-                                if(! $gnodes[$bh]->getJobs())
-                                {
-                                        $na_cpus += ($bm['cpu_num'][VAL]);
-                                        $na_nodes += 1;
-                                }
-                        }                               
+                        $na_nodes       += 1;
+                        $na_cpus        += $metrics[$ghost]['cpu_num']['VAL'];
                 }
         }
-                
+
         // Running / queued amount jobs graph
         //