Changeset 535 for trunk/web2/addons/job_monarch/jobstore.php
- Timestamp:
- 07/10/08 15:54:35 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web2/addons/job_monarch/jobstore.php
r534 r535 52 52 function getList() 53 53 { 54 global $jobs ;54 global $jobs, $hearbeat; 55 55 56 //print_r( $jobs );57 56 $job_count = count( $jobs ); 58 57 … … 67 66 foreach( $jobs as $jobid => $jobattrs ) 68 67 { 69 if( $reported!= $heartbeat )70 { // Old job: skip71 continue;72 }68 //if( $jobattrs['reported'] != $heartbeat ) 69 //{ 70 // continue; 71 //} 73 72 74 73 $jr['jid'] = strval( $jobid ); … … 79 78 $jr['requested_time'] = makeTime( timeToEpoch( $jobattrs['requested_time'] ) ); 80 79 81 if( $j obattrs[status] == 'R' )80 if( $jr['status'] == 'R' ) 82 81 { 83 82 $nodes = count( $jobattrs[nodes] ); … … 88 87 } 89 88 90 //unset( $jr['nodes'] ); 91 //unset( $jr['poll_interval'] ); 92 //unset( $jr['reported'] ); 89 $jr['ppn'] = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 ); 90 $jr['nodect'] = strval( $nodes ); 93 91 94 $jr['ppn'] = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 ); 95 $jr['cpu'] = strval( $nodes * (int) $ppn ); 96 97 98 if( $jobattrs[status] == 'R' ) 92 if( $jr['status'] == 'R' ) 99 93 { 100 94 $jr['nodes'] = implode( ",", $jobattrs['nodes'] ); 95 } 96 else 97 { 98 $jr['nodes'] = ""; 101 99 } 102 100 103 101 $jr['queued_timestamp'] = makeDate( $jobattrs['queued_timestamp'] ); 104 102 $jr['start_timestamp'] = ($jobattrs['start_timestamp'] ? makeDate( $jobattrs['start_timestamp'] ) : ""); 103 104 if( $jr['status'] == 'R' ) 105 { 106 $runningtime = (int) $jobattrs['reported'] - (int) $jobattrs['start_timestamp']; 107 $jr['runningtime'] = makeTime( $runningtime ); 108 } 109 else 110 { 111 $jr['runningtime'] = ""; 112 } 105 113 106 114 $jobresults[] = $jr;
Note: See TracChangeset
for help on using the changeset viewer.