From 688805400bb4ff86801291e3d11e4430285fc5a3 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 14:18:35 -0400 Subject: Initialize number of slices in edf_wm_params structure. Move parsing function in common.c --- bin/common.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ bin/rt_launch_edfwm.c | 87 +---------------------------------------- bin/rtspin_edfwm.c | 86 ----------------------------------------- include/common.h | 4 ++ 4 files changed, 109 insertions(+), 172 deletions(-) diff --git a/bin/common.c b/bin/common.c index 452b882..1cf5be0 100644 --- a/bin/common.c +++ b/bin/common.c @@ -9,3 +9,107 @@ void bail_out(const char* msg) perror(msg); exit(-1 * errno); } + +/* EDF-WM helper functions to parse a custom text file format to "easily" + * launch tests with rtspin and rt_launch: + * + * Format for task: + * + * . + * + * If the task is split on multiple slices, slices_number is non 0 + * and we scan a list of slice parameters up to slices_number: + * + * Format for slices: + * + * . + * + * The offset is the start time for the slice relative to the job release. + * + * Example: + * 14 2.26245771754 10 0 5 2 + * 14 5 5.000000 1.497306 0.000000 + * 14 7 10.000000 0.765152 5.000000 + */ + +#define fms_to_ns(x) (lt_t)(((x) * __NS_PER_MS)) +/* + * . + */ +int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, + struct edf_wm_params *wm) +{ + int i, tid; + unsigned int cpu; + double deadline, budget, offset; + + for (i = 0; i < slices_no; i++) { + + if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu, + &deadline, &budget, &offset) != EOF) { + + if (task_id != tid) { + fprintf(stderr, "task_id %d != tid %d\n", + task_id, tid); + return -1; + } + + wm->slices[i].deadline = fms_to_ns(deadline); + wm->slices[i].budget = fms_to_ns(budget); + wm->slices[i].offset = fms_to_ns(offset); + + printf("slice(tid, cpu, d, e, ph) = (%d, %u, %llu, %llu, %llu)\n", + tid, cpu, wm->slices[i].deadline, + wm->slices[i].budget, wm->slices[i].offset); + } + + if (ferror(ts)) { + fprintf(stderr, "Cannot read file\n"); + return -1; + } + } + wm->count = slices_no; + printf("--- total %u slices ---\n", wm->count); + return 0; +} + +/* + * . + */ +int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) +{ + int task_id, ret = 1; + unsigned int cpu, sliceno; + double fwcet, fperiod, fphase; + + ret = fscanf(ts, "%d %lf %lf %lf %d %d\n", + &task_id, &fwcet, &fperiod, &fphase, &cpu, &sliceno); + + if (ferror(ts)) + goto err; + + rt->exec_cost = fms_to_ns(fwcet); + rt->period = fms_to_ns(fperiod); + rt->phase = fms_to_ns(fphase); + rt->cpu = cpu; + rt->cls = RT_CLASS_HARD; + rt->budget_policy = PRECISE_ENFORCEMENT; + + printf("(tid, wcet, period, ph, cpu, slices) = " + "(%d, %llu, %llu, %llu, %u, %u)\n", + 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); + if (ret < 0) + goto err; + } + + return 0; + +err: + fprintf(stderr, "Error parsing file\n"); + return -1; +} + diff --git a/bin/rt_launch_edfwm.c b/bin/rt_launch_edfwm.c index b5a972c..9e8a322 100644 --- a/bin/rt_launch_edfwm.c +++ b/bin/rt_launch_edfwm.c @@ -7,6 +7,7 @@ #include "litmus.h" #include "common.h" + typedef struct { int wait; char * exec_path; @@ -36,92 +37,6 @@ void usage(char *error) { exit(1); } -#define fms_to_ns(x) (lt_t)(((x) * __NS_PER_MS)) -/* - * . - */ -int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, - struct edf_wm_params *wm) -{ - int i, tid; - unsigned int cpu; - double deadline, budget, offset; - - for (i = 0; i < slices_no; i++) { - - if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu, - &deadline, &budget, &offset) != EOF) { - - if (task_id != tid) { - fprintf(stderr, "task_id %d != tid %d\n", - task_id, tid); - return -1; - } - - wm->slices[i].deadline = fms_to_ns(deadline); - wm->slices[i].budget = fms_to_ns(budget); - wm->slices[i].offset = fms_to_ns(offset); - printf("slice(tid, cpu, d, e, ph) = (%d, %u, %llu, %llu, %llu)\n", - tid, cpu, wm->slices[i].deadline, - wm->slices[i].budget, wm->slices[i].offset); - } - if (ferror(ts)) { - fprintf(stderr, "Cannot read file\n"); - return -1; - } - } - return 0; -} - -/* Custom format to read parameters for tasks from a plain text file: - * . - * If the task is split on multiple slices, slices_number is non 0 - * and we scan a list of slice parameters up to slices_number: - * . - * The offset is the start time for the slice relative to the job release. - * - * FIXME: this function should go in a separate file where all the parsing - * funtions for the semi-part plugins are. It will help in later testing with - * "tasks" programs. - */ -int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) -{ - int task_id, ret = 1; - unsigned int cpu, sliceno; - double fwcet, fperiod, fphase; - - ret = fscanf(ts, "%d %lf %lf %lf %d %d\n", - &task_id, &fwcet, &fperiod, &fphase, &cpu, &sliceno); - - if (ferror(ts)) - goto err; - - rt->exec_cost = fms_to_ns(fwcet); - rt->period = fms_to_ns(fperiod); - rt->phase = fms_to_ns(fphase); - rt->cpu = cpu; - rt->cls = RT_CLASS_HARD; - rt->budget_policy = PRECISE_ENFORCEMENT; - - printf("(tid, wcet, period, ph, cpu, slices) = " - "(%d, %llu, %llu, %llu, %u, %u)\n", - 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); - if (ret < 0) - goto err; - } - - return 0; - -err: - fprintf(stderr, "Error parsing file\n"); - return -1; -} - #define OPTSTR "w" int main(int argc, char** argv) diff --git a/bin/rtspin_edfwm.c b/bin/rtspin_edfwm.c index 200fb4c..21a5f3b 100644 --- a/bin/rtspin_edfwm.c +++ b/bin/rtspin_edfwm.c @@ -133,92 +133,6 @@ static int job(double exec_time) return 0; } -#define fms_to_ns(x) (lt_t)(((x) * __NS_PER_MS)) -/* - * . - */ -int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, - struct edf_wm_params *wm) -{ - int i, tid; - unsigned int cpu; - double deadline, budget, offset; - - for (i = 0; i < slices_no; i++) { - - if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu, - &deadline, &budget, &offset) != EOF) { - - if (task_id != tid) { - fprintf(stderr, "task_id %d != tid %d\n", - task_id, tid); - return -1; - } - - wm->slices[i].deadline = fms_to_ns(deadline); - wm->slices[i].budget = fms_to_ns(budget); - wm->slices[i].offset = fms_to_ns(offset); - - printf("slice(tid, cpu, d, e, ph) = (%d, %u, %llu, %llu, %llu)\n", - tid, cpu, wm->slices[i].deadline, - wm->slices[i].budget, wm->slices[i].offset); - } - if (ferror(ts)) { - fprintf(stderr, "Cannot read file\n"); - return -1; - } - } - return 0; -} - -/* Custom format to read parameters for tasks from a plain text file: - * . - * If the task is split on multiple slices, slices_number is non 0 - * and we scan a list of slice parameters up to slices_number: - * . - * The offset is the start time for the slice relative to the job release. - * - * FIXME: this function should go in a separate file where all the parsing - * funtions for the semi-part plugins are. It will help in later testing with - * "tasks" programs. - */ -int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) -{ - int task_id, ret = 1; - unsigned int cpu, sliceno; - double fwcet, fperiod, fphase; - - ret = fscanf(ts, "%d %lf %lf %lf %d %d\n", - &task_id, &fwcet, &fperiod, &fphase, &cpu, &sliceno); - - if (ferror(ts)) - goto err; - - rt->exec_cost = fms_to_ns(fwcet); - rt->period = fms_to_ns(fperiod); - rt->phase = fms_to_ns(fphase); - rt->cpu = cpu; - rt->cls = RT_CLASS_HARD; - rt->budget_policy = PRECISE_ENFORCEMENT; - - printf("(tid, wcet, period, ph, cpu, slices) = " - "(%d, %llu, %llu, %llu, %u, %u)\n", - 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); - if (ret < 0) - goto err; - } - - return 0; - -err: - fprintf(stderr, "Error parsing file\n"); - return -1; -} - #define OPTSTR "wld:v" int main(int argc, char** argv) diff --git a/include/common.h b/include/common.h index d1234ba..dbcfd34 100644 --- a/include/common.h +++ b/include/common.h @@ -1,7 +1,11 @@ #ifndef COMMON_H #define COMMON_H +#include "litmus.h" void bail_out(const char* msg); +/* EDF-WM helper functions to parse task parameters from file */ +int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt); + #endif -- cgit v1.2.2