Merge branch 'edf-wm' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/liblitmus2010 into wip-edf-wm

Conflicts:
	bin/common.c

1 files changed, 9 insertions, 3 deletions

diff --git a/bin/common.c b/bin/common.c
index ece9849..4fd24e1 100644
--- a/bin/common.c
+++ b/bin/common.c
@@ -38,12 +38,16 @@ void bail_out(const char* msg)
  * <task_id, cpu, deadline (from job release), budget, offset> .
  */
 int parse_edfwm_slice(FILE *ts, int slices_no, int task_id,
-                struct edf_wm_params *wm)
+                      struct rt_task *rt)
 {
         int i, tid;
         unsigned int cpu;
         double deadline, budget, offset;
 
+        lt_t total_budget = 0;
+
+        struct edf_wm_params* wm = (struct edf_wm_params*) &rt->semi_part;
+
         for (i = 0; i < slices_no; i++) {
 
                 if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu,
@@ -70,6 +74,8 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id,
                                                 wm->slices[i].budget);
                                 return -1;
                         }
+
+                        total_budget += wm->slices[i].budget;
                 }
 
                 if (ferror(ts)) {
@@ -78,6 +84,7 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id,
                 }
         }
         wm->count = slices_no;
+        rt->exec_cost = total_budget;
         printf("--- total %u slices ---\n", wm->count);
         return 0;
 }
@@ -109,8 +116,7 @@ int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt)
                         task_id, rt->exec_cost, rt->period, rt->phase, cpu, sliceno);
         if (sliceno > 0) {
                 memset(&rt->semi_part, 0, sizeof(struct edf_wm_params));
-                ret = parse_edfwm_slice(ts, sliceno, task_id,
-                                (struct edf_wm_params*) &rt->semi_part);
+                ret = parse_edfwm_slice(ts, sliceno, task_id, rt);
                 if (ret < 0)
                         goto err;
         }