Add support for {cput,walltime}{,_req}_sec to job-db-update.

tabaer · Dec 20, 2016 · 9a49104 · 9a49104
1 parent 5636a4f
commit 9a49104
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/sbin/job-db-update b/sbin/job-db-update
@@ -320,42 +320,42 @@ while ( defined($ARGV[0]) )
 		  }
 		if ( defined($resource{"Resource_List.cput"}) )
 		  {
-		    $uhead.=",cput_req = \'".$resource{"Resource_List.cput"}."\'";
-		    $ihead.=",cput_req";
-		    $itail.=",\'".$resource{"Resource_List.cput"}."\'";
+		    $uhead.=",cput_req = \'".$resource{"Resource_List.cput"}."\',cput_req_sec = TIME_TO_SEC(\'".$resource{"Resource_List.cput"}."\')";
+		    $ihead.=",cput_req,cput_req_sec";
+		    $itail.=",\'".$resource{"Resource_List.cput"}."\',TIME_TO_SEC(\'".$resource{"Resource_List.cput"}."\')";
 		  }
 		if ( defined($resource{"resources_used.cput"}) )
 		  {
-		    $ihead.=",cput";
-		    if ( $resource{"resources_used.walltime"} =~ /^\d+$/ ) 
+		    $ihead.=",cput,cput_sec";
+		    if ( $resource{"resources_used.cput"} =~ /^\d+$/ ) 
 		      {
-                        $uhead.=",walltime = SEC_TO_TIME(".$resource{"resources_used.walltime"}.")";
-		        $itail.=",SEC_TO_TIME(".$resource{"resources_used.walltime"}.")";
+                        $uhead.=",cput = SEC_TO_TIME(".$resource{"resources_used.cput"}."),cput_sec = ".$resource{"resources_used.cput"};
+		        $itail.=",SEC_TO_TIME(".$resource{"resources_used.cput"}."),".$resource{"resources_used.cput"};
                       }
 		    else
 		      {
-			$uhead.=",cput = \'".$resource{"resources_used.cput"}."\'";
-			$itail.=",\'".$resource{"resources_used.cput"}."\'";
+			$uhead.=",cput = \'".$resource{"resources_used.cput"}."\',cput_sec = TIME_TO_SEC(\'".$resource{"resources_used.cput"}."\')";
+			$itail.=",\'".$resource{"resources_used.cput"}."\',TIME_TO_SEC(\'".$resource{"resources_used.cput"}."\')";
 		      }
 		  }
 		if ( defined($resource{"Resource_List.walltime"}) )
 		  {
-		    $uhead.=",walltime_req = \'".$resource{"Resource_List.walltime"}."\'";
-		    $ihead.=",walltime_req";
-		    $itail.=",\'".$resource{"Resource_List.walltime"}."\'";
+		    $uhead.=",walltime_req = \'".$resource{"Resource_List.walltime"}."\',walltime_req_sec = TIME_TO_SEC(\'".$resource{"Resource_List.walltime"}."\')";
+		    $ihead.=",walltime_req,walltime_req_sec";
+		    $itail.=",\'".$resource{"Resource_List.walltime"}."\',TIME_TO_SEC(\'".$resource{"Resource_List.walltime"}."\')";
 		  }
 		if ( defined($resource{"resources_used.walltime"}) )
 		  {
-		    $ihead.=",walltime";
+		    $ihead.=",walltime,walltime_sec";
 		    if ( $resource{"resources_used.walltime"} =~ /^\d+$/ ) 
 		      {
-                        $uhead.=",walltime = SEC_TO_TIME(".$resource{"resources_used.walltime"}.")";
-		        $itail.=",SEC_TO_TIME(".$resource{"resources_used.walltime"}.")";
+                        $uhead.=",walltime = SEC_TO_TIME(".$resource{"resources_used.walltime"}."),walltime_sec = ".$resource{"resources_used.walltime"};
+		        $itail.=",SEC_TO_TIME(".$resource{"resources_used.walltime"}."),".$resource{"resources_used.walltime"};
                       }
 		    else
 		      {
-		        $uhead.=",walltime = \'".$resource{"resources_used.walltime"}."\'";
-		        $itail.=",\'".$resource{"resources_used.walltime"}."\'";
+		        $uhead.=",walltime = \'".$resource{"resources_used.walltime"}."\',walltime_sec = TIME_TO_SEC(\'".$resource{"resources_used.walltime"}."\')";
+		        $itail.=",\'".$resource{"resources_used.walltime"}."\',TIME_TO_SEC(\'".$resource{"resources_used.walltime"}."\')";
 		      }
 		  }
 		if ( defined($resource{"Resource_List.mem"}) )