Fixed time unit for parameter MAXWALLTIME in batch managers PBS and Local (minutes...

diff --git a/src/Local/Batch_BatchManager_Local.cxx b/src/Local/Batch_BatchManager_Local.cxx
index 4e356de322ab702b1033e9a11352274fd3d71484..4456fec50f5498f080cfd1acf1666f514bc48441 100644 (file)
--- a/src/Local/Batch_BatchManager_Local.cxx
+++ b/src/Local/Batch_BatchManager_Local.cxx
@@ -601,15 +601,15 @@ namespace Batch {
 
       // On regarde si le fils n'a pas depasse son temps (wallclock time)
       time_t child_currenttime = time(NULL);
-      time_t child_elapsedtime = child_currenttime - child_starttime;
+      long child_elapsedtime_minutes = (child_currenttime - child_starttime) / 60L;
       if (param.find(MAXWALLTIME) != param.end()) {
-        int maxwalltime = param[MAXWALLTIME];
+        long maxwalltime = param[MAXWALLTIME];
         //       cout << "child_starttime          = " << child_starttime        << endl
         //            << "child_currenttime        = " << child_currenttime      << endl
         //            << "child_elapsedtime        = " << child_elapsedtime      << endl
         //            << "maxwalltime              = " << maxwalltime            << endl
         //            << "int(maxwalltime * 1.1)   = " << int(maxwalltime * 1.1) << endl;
-        if (child_elapsedtime > int(maxwalltime * 1.1) ) { // On se donne 10% de marge avant le KILL
+        if (child_elapsedtime_minutes > long((float)maxwalltime * 1.1) ) { // On se donne 10% de marge avant le KILL
           UNDER_LOCK( cout << "Father is sending KILL command to the thread " << _id << endl );
           // On introduit une commande dans la queue du thread
           // @@@ --------> SECTION CRITIQUE <-------- @@@
@@ -620,7 +620,7 @@ namespace Batch {
           // @@@ --------> SECTION CRITIQUE <-------- @@@
 
 
-        } else if (child_elapsedtime > maxwalltime ) {
+        } else if (child_elapsedtime_minutes > maxwalltime ) {
           UNDER_LOCK( cout << "Father is sending TERM command to the thread " << _id << endl );
           // On introduit une commande dans la queue du thread
           // @@@ --------> SECTION CRITIQUE <-------- @@@

diff --git a/src/PBS/Batch_Job_PBS.cxx b/src/PBS/Batch_Job_PBS.cxx
index 908c353e03dc8eeca7f23ae50ba9255562f52328..cd84b8f476fa356f5465a9e03a170e94328cf04f 100644 (file)
--- a/src/PBS/Batch_Job_PBS.cxx
+++ b/src/PBS/Batch_Job_PBS.cxx
@@ -171,11 +171,10 @@ namespace Batch {
 
       } else if ( (*it).first == MAXWALLTIME ) {
        char attr_value[32];
-       long secondes = (*it).second;
-       long heures = secondes / 3600L;
-       long minutes = (secondes - 3600L * heures) / 60L;
-       secondes = secondes % 60L;
-       sprintf(attr_value, "%02ld:%02ld:%02ld", heures, minutes, secondes);
+       long minutes = (*it).second;
+       long heures = minutes / 60L;
+       minutes -= 60L * heures;
+       sprintf(attr_value, "%02ld:%02ld:00", heures, minutes);
 
        setResourceAttributeOP(_p_attr_list, ATTR_l, "walltime", attr_value);