Changeset 578 for trunk/web2/addons
- Timestamp:
- 02/03/09 17:11:41 (15 years ago)
- Location:
- trunk/web2/addons/job_monarch
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/jobstore.php
r571 r578 4 4 set_time_limit(0); 5 5 6 $c = $_POST[ "c"];6 $c = $_POST['c']; 7 7 $clustername = $c; 8 8 $cluster = $c; … … 10 10 // Supplied by ExtJS when DataStore has remoteSort: true 11 11 // 12 $sortfield = isset($_POST['sort'] ) ? $_POST[ "sort"] : "jid";13 $sortorder = isset($_POST['dir'] ) ? $_POST[ "dir"] : "ASC"; // ASC or DESC12 $sortfield = isset($_POST['sort'] ) ? $_POST['sort'] : "jid"; 13 $sortorder = isset($_POST['dir'] ) ? $_POST['dir'] : "ASC"; // ASC or DESC 14 14 15 15 // Search query from ext.SearchField … … 47 47 // Need to fool Ganglia here: or it won't parse XML for our cluster 48 48 // 49 $HTTP_POST_VARS[ "c"] = $c;50 $_GET[ "c"] = $c;49 $HTTP_POST_VARS['c'] = $c; 50 $_GET['c'] = $c; 51 51 52 52 global $c, $clustername, $cluster; … … 58 58 59 59 session_start(); 60 unset( $_SESSION[ "data"] );61 $_SESSION[ "data"] = &$myxml_data;60 unset( $_SESSION['data'] ); 61 $_SESSION['data'] = &$myxml_data; 62 62 63 63 global $jobs, $metrics; … … 203 203 foreach( $jobs as $jobid => $jobattrs ) 204 204 { 205 $state = $jobattrs[ status];206 $user = $jobattrs[ owner];207 $queue = $jobattrs[ queue];208 $name = $jobattrs[ name];209 $req_cpu = $jobattrs[ requested_time];210 $req_memory = $jobattrs[ requested_memory];211 212 $nodes = $jobattrs[ nodes];213 214 $ppn = (int) $jobattrs[ ppn] ? $jobattrs[ppn] : 1;205 $state = $jobattrs['status']; 206 $user = $jobattrs['owner']; 207 $queue = $jobattrs['queue']; 208 $name = $jobattrs['name']; 209 $req_cpu = $jobattrs['requested_time']; 210 $req_memory = $jobattrs['requested_memory']; 211 212 $nodes = $jobattrs['nodes']; 213 214 $ppn = (int) $jobattrs['ppn'] ? $jobattrs['ppn'] : 1; 215 215 216 216 if( $state == 'R' ) … … 222 222 $cpus = ((int) $nodes ) * $ppn; 223 223 } 224 $queued_time = (int) $jobattrs[ queued_timestamp];225 $start_time = (int) $jobattrs[ start_timestamp];224 $queued_time = (int) $jobattrs['queued_timestamp']; 225 $start_time = (int) $jobattrs['start_timestamp']; 226 226 $runningtime = $report_time - $start_time; 227 227 … … 322 322 foreach( $jobs as $jobid => $jobattrs ) 323 323 { 324 $state = $jobattrs[ status];325 $user = $jobattrs[ owner];326 $jqueue = $jobattrs[ queue];327 $name = $jobattrs[ name];328 $req_cpu = $jobattrs[ requested_time];329 $req_memory = $jobattrs[ requested_memory];324 $state = $jobattrs['status']; 325 $user = $jobattrs['owner']; 326 $jqueue = $jobattrs['queue']; 327 $name = $jobattrs['name']; 328 $req_cpu = $jobattrs['requested_time']; 329 $req_memory = $jobattrs['requested_memory']; 330 330 331 331 if( $state == 'R' ) 332 332 { 333 $nodes = count( $jobattrs[ nodes] );333 $nodes = count( $jobattrs['nodes'] ); 334 334 335 335 $mynodehosts = array(); 336 foreach( $jobattrs[ nodes] as $mynode )336 foreach( $jobattrs['nodes'] as $mynode ) 337 337 { 338 338 //if( $use_fqdn == 1) 339 339 //{ 340 // $mynode = $mynode.".".$jobattrs[ domain];340 // $mynode = $mynode.".".$jobattrs['domain']; 341 341 //} 342 342 $mynodehosts[] = $mynode; 343 343 } 344 $jobattrs[ nodes] = $mynodehosts;344 $jobattrs['nodes'] = $mynodehosts; 345 345 } 346 346 else 347 347 { 348 $nodes = $jobattrs[ nodes];348 $nodes = $jobattrs['nodes']; 349 349 } 350 350 351 $ppn = (int) $jobattrs[ ppn] ? $jobattrs[ppn] : 1;351 $ppn = (int) $jobattrs['ppn'] ? $jobattrs['ppn'] : 1; 352 352 $cpus = $nodes * $ppn; 353 $queued_time = (int) $jobattrs[ queued_timestamp];354 $start_time = (int) $jobattrs[ start_timestamp];353 $queued_time = (int) $jobattrs['queued_timestamp']; 354 $start_time = (int) $jobattrs['start_timestamp']; 355 355 $runningtime = $report_time - $start_time; 356 356 357 $domain = $jobattrs[ domain];357 $domain = $jobattrs['domain']; 358 358 $domain_len = 0 - strlen( $domain ); 359 359 … … 454 454 $nr['v'] = '0'; 455 455 456 $cpus = $metrics[$host][ "cpu_num"]["VAL"];456 $cpus = $metrics[$host]['cpu_num']['VAL']; 457 457 458 458 if ( !$cpus ) … … 461 461 } 462 462 463 $load_one = $metrics[$host][ "load_one"]["VAL"];463 $load_one = $metrics[$host]['load_one']['VAL']; 464 464 $load = ((float) $load_one) / $cpus; 465 465 $load_color = load_color($load); … … 532 532 if( $jr['status'] == 'R' ) 533 533 { 534 $nodes = count( $jobs[$jobid][ nodes] );534 $nodes = count( $jobs[$jobid]['nodes'] ); 535 535 } 536 536 else 537 537 { 538 $nodes = (int) $jobs[$jobid][ nodes];539 } 540 541 $jr['ppn'] = strval( $jobs[$jobid][ ppn] ? $jobs[$jobid][ppn] : 1 );538 $nodes = (int) $jobs[$jobid]['nodes']; 539 } 540 541 $jr['ppn'] = strval( $jobs[$jobid]['ppn'] ? $jobs[$jobid]['ppn'] : 1 ); 542 542 $jr['nodect'] = strval( $nodes ); 543 543 -
trunk/web2/addons/job_monarch/libtoga.php
r577 r578 34 34 $this->restvars = array(); 35 35 36 $this->clustername = $httpvars[ "c"] ? $httpvars["c"] : $getvars["c"];37 $this->metricname = $httpvars[ "m"] ? $httpvars["m"] : $getvars["m"];36 $this->clustername = $httpvars['c'] ? $httpvars['c'] : $getvars['c']; 37 $this->metricname = $httpvars['m'] ? $httpvars['m'] : $getvars['m']; 38 38 39 39 if( count( $httpvars ) > 0 ) … … 1233 1233 // determine the offset between colors 1234 1234 // 1235 $step_offset = array("r" => ($background[ "r"] / $ds_steps), "g" => ($background["g"] / $ds_steps), "b" => ($background["b"] / $ds_steps));1235 $step_offset = array("r" => ($background['r'] / $ds_steps), "g" => ($background['g'] / $ds_steps), "b" => ($background['b'] / $ds_steps)); 1236 1236 1237 1237 // calculate and allocate the needed colors … … 1241 1241 for ($i = 0; $i <= $ds_steps ; $i++) 1242 1242 { 1243 $colors[$i] = imagecolorallocate($this->image, round($current_color[ "r"]), round($current_color["g"]), round($current_color["b"]));1244 1245 $current_color[ "r"] -= $step_offset["r"];1246 $current_color[ "g"] -= $step_offset["g"];1247 $current_color[ "b"] -= $step_offset["b"];1243 $colors[$i] = imagecolorallocate($this->image, round($current_color['r']), round($current_color['g']), round($current_color['b'])); 1244 1245 $current_color['r'] -= $step_offset['r']; 1246 $current_color['g'] -= $step_offset['g']; 1247 $current_color['b'] -= $step_offset['b']; 1248 1248 } 1249 1249
Note: See TracChangeset
for help on using the changeset viewer.