Try to compute tighter bounds with uniprocessorswip-ecrts14-pgm

1 files changed, 22 insertions, 8 deletions

diff --git a/schedcat/sched/edf/gel_pl.py b/schedcat/sched/edf/gel_pl.py
index 2349f7b..62a5229 100644
--- a/schedcat/sched/edf/gel_pl.py
+++ b/schedcat/sched/edf/gel_pl.py
@@ -54,18 +54,32 @@ def compute_gedf_response_details(no_cpus, tasks, rounds):
     return compute_response_details(no_cpus, tasks, rounds)
 
 def compute_response_details(no_cpus, tasks, rounds):
-    if (no_cpus == 1) and forall(tasks)(lambda t: t.prio_pt == t.period):
-        details = AnalysisDetails(tasks)
-        details.bounds = [task.period for task in tasks]
-        details.S_i = [0.0 for task in tasks]
-        details.G_i = [0.0 for task in tasks]
-        return details
+#    if (no_cpus == 1) and forall(tasks)(lambda t: t.prio_pt == t.period):
+#        details = AnalysisDetails(tasks)
+#        details.bounds = [task.period for task in tasks]
+#        details.S_i = [0.0 for task in tasks]
+#        details.G_i = [0.0 for task in tasks]
+#        return details
+    details = None
     if schedcat.sched.using_native:
         native_ts = schedcat.sched.get_native_taskset(tasks)
         gel_obj = native.GELPl(no_cpus, native_ts, rounds)
-        return AnalysisDetails(tasks, gel_obj)
+        details = AnalysisDetails(tasks, gel_obj)
     else:
-        return compute_response_bounds(no_cpus, tasks, rounds)
+        details = compute_response_bounds(no_cpus, tasks, rounds)
+    if (no_cpus == 1) and forall(tasks)(lambda t: t.prio_pt == t.period):
+        # compute bounds for optimal uniprocessor
+        details2 = AnalysisDetails(tasks)
+        details2.bounds = [task.period for task in tasks]
+        # use the optimal bounds if the computed bound is ever
+        # greater than optimal bound (period)
+        for computed_bound, optimal_bound in zip(details.bounds, details2.bounds):
+            if computed_bound > optimal_bound:
+                details2.S_i = [0.0] * len(tasks)
+                details2.G_i = [0.0] * len(tasks)
+                details = details2
+                break
+    return details
 
 def compute_response_bounds(no_cpus, tasks, rounds):
     """This function computes response time bounds for the given set of tasks