fix: deterministic job oders

src/json_workload.cpp

@@ -177,7 +177,18 @@ Job *Workload::job_from_json_object(const Value &object)
 
 bool JobComparator::operator()(const Job *j1, const Job *j2) const
 {
-    return j1->id < j2->id;
+    PPK_ASSERT_ERROR(j1->id.find('!') != string::npos,
+        "I thought jobID had always a form 'wl!id'...");
+
+    string id1 = j1->id.substr(j1->id.find('!') + 1, j1->id.size());
+    string id2 = j2->id.substr(j2->id.find('!') + 1, j2->id.size());
+
+    if (id1 == id2) /* different workload, same job number: comp on wl name */
+        return j1->id < j2->id;
+    if (id1.length() == id2.length()) /* same length: lexicographic order */
+        return id1 < id2;
+    return id1.length() < id2.length();
+
 }
 
 bool SessionComparator::operator()(const Session *s1, const Session *s2) const

src/queue.cpp

@@ -45,7 +45,7 @@ bool FCFSOrder::compare(const SortableJob *j1, const SortableJob *j2, const Sort
     (void) info;
 
     if (j1->release_date == j2->release_date)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->release_date < j2->release_date;
 }
@@ -67,7 +67,7 @@ bool LCFSOrder::compare(const SortableJob *j1, const SortableJob *j2, const Sort
     (void) info;
 
     if (j1->release_date == j2->release_date)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->release_date > j2->release_date;
 }
@@ -95,7 +95,7 @@ bool DescendingBoundedSlowdownOrder::compare(const SortableJob *j1, const Sortab
     (void) info;
 
     if (j1->bounded_slowdown == j2->bounded_slowdown)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->bounded_slowdown > j2->bounded_slowdown;
 }
@@ -116,7 +116,7 @@ bool DescendingSlowdownOrder::compare(const SortableJob *j1, const SortableJob *
     (void) info;
 
     if (j1->slowdown == j2->slowdown)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->slowdown > j2->slowdown;
 }
@@ -138,7 +138,7 @@ bool AscendingSizeOrder::compare(const SortableJob *j1, const SortableJob *j2, c
 
     if (j1->job->nb_requested_resources == j2->job->nb_requested_resources)
         if (j1->job->submission_time == j2->job->submission_time)
-            return j1->job->id < j2->job->id;
+            return jobcmp(j1->job, j2->job);
         else
             return j1->job->submission_time < j2->job->submission_time;
     else
@@ -163,7 +163,7 @@ bool DescendingSizeOrder::compare(const SortableJob *j1, const SortableJob *j2,
 
     if (j1->job->nb_requested_resources == j2->job->nb_requested_resources)
         if (j1->job->submission_time == j2->job->submission_time)
-            return j1->job->id < j2->job->id;
+            return jobcmp(j1->job, j2->job);
         else
             return j1->job->submission_time < j2->job->submission_time;
     else
@@ -187,7 +187,7 @@ bool AscendingWalltimeOrder::compare(const SortableJob *j1, const SortableJob *j
     (void) info;
 
     if (j1->job->walltime == j2->job->walltime)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->job->walltime < j2->job->walltime;
 }
@@ -209,7 +209,7 @@ bool DescendingWalltimeOrder::compare(const SortableJob *j1, const SortableJob *
     (void) info;
 
     if (j1->job->walltime == j2->job->walltime)
-        return j1->job->id < j2->job->id;
+        return jobcmp(j1->job, j2->job);
     else
         return j1->job->walltime > j2->job->walltime;
 }

src/queue.hpp

@@ -2,7 +2,7 @@
 
 #include <list>
 
-struct Job;
+#include "json_workload.hpp"
 
 #include "schedule.hpp"
 
@@ -37,6 +37,9 @@ public:
     virtual ~SortableJobOrder();
     virtual bool compare(const SortableJob * j1, const SortableJob * j2, const CompareInformation * info = nullptr) const = 0;
     virtual void updateJob(SortableJob * job, const UpdateInformation * info = nullptr) const = 0;
+
+protected:
+    JobComparator jobcmp;
 };
 
 class FCFSOrder : public SortableJobOrder