From 2ab941c97d32c0f3314ec3e6482a0fc017bac918 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 12:05:47 -0400 Subject: Add sporadic_task_ns_semi() helper function for semi-part algos. --- include/litmus.h | 4 ++++ src/litmus.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/litmus.h b/include/litmus.h index b798c92..de7301d 100644 --- a/include/litmus.h +++ b/include/litmus.h @@ -9,6 +9,7 @@ extern "C" { * This is required for the rt_param * and control_page structures. */ +#include #include #include @@ -40,6 +41,9 @@ int sporadic_task_ns( int cpu, task_class_t cls, budget_policy_t budget_policy, int set_cpu_set); +/* times are in ns, specific helper for semi-partitioned algos */ +int sporadic_task_ns_semi(struct rt_task *rt); + /* budget enforcement off by default in these macros */ #define sporadic_global(e, p) \ sporadic_task(e, p, 0, 0, RT_CLASS_SOFT, NO_ENFORCEMENT, 0) diff --git a/src/litmus.c b/src/litmus.c index f71f337..6a7e6e9 100644 --- a/src/litmus.c +++ b/src/litmus.c @@ -29,8 +29,6 @@ task_class_t str2class(const char* str) return -1; } -#define NS_PER_MS 1000000 - /* only for best-effort execution: migrate to target_cpu */ int be_migrate_to(int target_cpu) { @@ -45,7 +43,7 @@ int sporadic_task(lt_t e, lt_t p, lt_t phase, int cpu, task_class_t cls, budget_policy_t budget_policy, int set_cpu_set) { - return sporadic_task_ns(e * NS_PER_MS, p * NS_PER_MS, phase * NS_PER_MS, + return sporadic_task_ns(e * __NS_PER_MS, p * __NS_PER_MS, phase * __NS_PER_MS, cpu, cls, budget_policy, set_cpu_set); } @@ -62,13 +60,24 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase, param.phase = phase; param.budget_policy = budget_policy; - if (set_cpu_set) { + if (set_cpu_set) { ret = be_migrate_to(cpu); check("migrate to cpu"); } return set_rt_task_param(gettid(), ¶m); } +/* Sporadic task helper function for Semi-Partitioned algorithms. */ +int sporadic_task_ns_semi(struct rt_task *param) +{ + int ret; + + ret = be_migrate_to(param->cpu); + check("migrate to cpu"); + + return set_rt_task_param(gettid(), param); +} + int init_kernel_iface(void); int init_litmus(void) -- cgit v1.2.2 From 96e576554fb76b6162adf7c8e96e3efa3dc8b256 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 12:06:26 -0400 Subject: Add rtspin_edffm launcher function It reads the parameter for a task from a text file. The format is: - (for task parameters). - (for slices). Example: 15 2.96343109764 10 0 3 7 15 3 1.428571 1.175260 0.000000 15 7 2.857143 0.700065 1.428571 15 2 4.285714 0.504732 2.857143 15 0 5.714286 0.279637 4.285714 15 1 7.142857 0.185294 5.714286 15 4 8.571429 0.065379 7.142857 15 6 10.000000 0.053062 8.571429 --- SConstruct | 1 + bin/rtspin_edfwm.c | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 bin/rtspin_edfwm.c diff --git a/SConstruct b/SConstruct index c41e41e..f21ae36 100644 --- a/SConstruct +++ b/SConstruct @@ -208,6 +208,7 @@ rt.Program('base_task', 'bin/base_task.c') mtrt.Program('base_mt_task', 'bin/base_mt_task.c') rt.Program('rt_launch', ['bin/rt_launch.c', 'bin/common.c']) rt.Program('rtspin', ['bin/rtspin.c', 'bin/common.c']) +rt.Program('rtspin_edfwm', ['bin/rtspin_edfwm.c', 'bin/common.c']) rt.Program('release_ts', 'bin/release_ts.c') rtm.Program('measure_syscall', 'bin/null_call.c') diff --git a/bin/rtspin_edfwm.c b/bin/rtspin_edfwm.c new file mode 100644 index 0000000..9a78aa3 --- /dev/null +++ b/bin/rtspin_edfwm.c @@ -0,0 +1,319 @@ +#include + +#include +#include +#include +#include +#include + +#include "litmus.h" +#include "common.h" + + +static double cputime() +{ + struct timespec ts; + int err; + err = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts); + if (err != 0) + perror("clock_gettime"); + return (ts.tv_sec + 1E-9 * ts.tv_nsec); +} + +static double wctime() +{ + struct timeval tv; + gettimeofday(&tv, NULL); + return (tv.tv_sec + 1E-6 * tv.tv_usec); +} + +void usage(char *error) { + fprintf(stderr, "Error: %s\n", error); + fprintf(stderr, + "Usage: rt_spin [-w] task_parameters_file duration\n" + " rt_spin -l\n"); + exit(1); +} + +#define NUMS 4096 +static int num[NUMS]; +static double loop_length = 1.0; +static char* progname; + +static int loop_once(void) +{ + int i, j = 0; + for (i = 0; i < NUMS; i++) + j += num[i]++; + return j; +} + +static int loop_for(double exec_time) +{ + double t = 0; + int tmp = 0; +/* while (t + loop_length < exec_time) { + tmp += loop_once(); + t += loop_length; + } +*/ + double start = cputime(); + double now = cputime(); + while (now + loop_length < start + exec_time) { + tmp += loop_once(); + t += loop_length; + now = cputime(); + } + + return tmp; +} + +static void fine_tune(double interval) +{ + double start, end, delta; + + start = wctime(); + loop_for(interval); + end = wctime(); + delta = (end - start - interval) / interval; + if (delta != 0) + loop_length = loop_length / (1 - delta); +} + +static void configure_loop(void) +{ + double start; + + /* prime cache */ + loop_once(); + loop_once(); + loop_once(); + + /* measure */ + start = wctime(); + loop_once(); /* hope we didn't get preempted */ + loop_length = wctime(); + loop_length -= start; + + /* fine tune */ + fine_tune(0.1); + fine_tune(0.1); + fine_tune(0.1); +} + +static void show_loop_length(void) +{ + printf("%s/%d: loop_length=%f (%ldus)\n", + progname, getpid(), loop_length, + (long) (loop_length * 1000000)); +} + +static void debug_delay_loop(void) +{ + double start, end, delay; + show_loop_length(); + while (1) { + for (delay = 0.5; delay > 0.01; delay -= 0.01) { + start = wctime(); + loop_for(delay); + end = wctime(); + printf("%6.4fs: looped for %10.8fs, delta=%11.8fs, error=%7.4f%%\n", + delay, + end - start, + end - start - delay, + 100 * (end - start - delay) / delay); + } + } +} + +static int job(double exec_time) +{ + loop_for(exec_time); + sleep_next_period(); + 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) { + + printf("slice(tid, cpu, d, e, ph) = (%d, %u, %lf, %lf, %lf)\n", + tid, cpu, deadline, budget, offset); + + 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); + } + if (ferror(ts)) { + fprintf(stderr, "Cannot read file\n"); + return -1; + } + } + return 1; +} + +/* 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 (ret != EOF) { + + printf("(tid, wcet, period, ph, cpu, slices) = " + "(%d, %.2f, %.2f, %.2f, %u, %u)\n", + task_id, fwcet, fperiod, fphase, cpu, sliceno); + + 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; + if (sliceno > 0) { + ret = parse_edfwm_slice(ts, sliceno, task_id, + (struct edf_wm_params*) &rt->semi_part); + if (ret < 0) + goto err; + } + } + if (ferror(ts)) + goto err; + + return EOF; + +err: + fprintf(stderr, "Error parsing file\n"); + return -1; +} + +#define OPTSTR "wld:v" + +int main(int argc, char** argv) +{ + int ret; + + int opt; + int wait = 0; + int test_loop = 0; + int skip_config = 0; + int verbose = 0; + double wcet_ms; + double duration, start; + + struct rt_task rt; + FILE *file; + + progname = argv[0]; + + while ((opt = getopt(argc, argv, OPTSTR)) != -1) { + switch (opt) { + case 'w': + wait = 1; + break; + case 'l': + test_loop = 1; + break; + case 'd': + /* manually configure delay per loop iteration + * unit: microseconds */ + loop_length = atof(optarg) / 1000000; + skip_config = 1; + break; + case 'v': + verbose = 1; + break; + case ':': + usage("Argument missing."); + break; + case '?': + default: + usage("Bad argument."); + break; + } + } + + + if (!skip_config) + configure_loop(); + + if (test_loop) { + debug_delay_loop(); + return 0; + } + + if (argc - optind < 2) + usage("Arguments missing."); + + if ((file = fopen(argv[optind + 0], "r")) == NULL) { + fprintf(stderr, "Cannot open %s\n", argv[1]); + return -1; + } + duration = atof(argv[optind + 1]); + + memset(&rt, 0, sizeof(struct rt_task)); + + while (parse_edfwm_ts_file(file, &rt) != EOF) { + + if (sporadic_task_ns_semi(&rt) < 0) + bail_out("could not setup rt task params"); + } + + fclose(file); + + if (verbose) + show_loop_length(); + + init_litmus(); + + ret = task_mode(LITMUS_RT_TASK); + if (ret != 0) + bail_out("could not become RT task"); + + if (wait) { + ret = wait_for_ts_release(); + if (ret != 0) + bail_out("wait_for_ts_release()"); + } + + wcet_ms = ((double) rt.exec_cost ) / __NS_PER_MS; + start = wctime(); + + while (start + duration > wctime()) { + job(wcet_ms * 0.0009); /* 90% wcet, in seconds */ + } + + return 0; +} -- cgit v1.2.2 From 67a0a36345f0e2b6a9a4858a1ac3949f7da52e65 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 12:51:06 -0400 Subject: Add rt_launch_edfwm launcher As rtspin_edfwm rt_launch_edfwm reads each task information from a text file (same format as rtspin_edfwm). --- SConstruct | 1 + bin/rt_launch_edfwm.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/litmus.h | 5 ++ src/task.c | 5 ++ 4 files changed, 193 insertions(+) create mode 100644 bin/rt_launch_edfwm.c diff --git a/SConstruct b/SConstruct index f21ae36..6a726c2 100644 --- a/SConstruct +++ b/SConstruct @@ -209,6 +209,7 @@ mtrt.Program('base_mt_task', 'bin/base_mt_task.c') rt.Program('rt_launch', ['bin/rt_launch.c', 'bin/common.c']) rt.Program('rtspin', ['bin/rtspin.c', 'bin/common.c']) rt.Program('rtspin_edfwm', ['bin/rtspin_edfwm.c', 'bin/common.c']) +rt.Program('rt_launch_edfwm', ['bin/rt_launch_edfwm.c', 'bin/common.c']) rt.Program('release_ts', 'bin/release_ts.c') rtm.Program('measure_syscall', 'bin/null_call.c') diff --git a/bin/rt_launch_edfwm.c b/bin/rt_launch_edfwm.c new file mode 100644 index 0000000..de65585 --- /dev/null +++ b/bin/rt_launch_edfwm.c @@ -0,0 +1,182 @@ +#include +#include +#include +#include +#include +#include + +#include "litmus.h" +#include "common.h" +typedef struct { + int wait; + char * exec_path; + char ** argv; +} startup_info_t; + + +int launch(void *task_info_p) { + startup_info_t *info = (startup_info_t*) task_info_p; + int ret; + if (info->wait) { + ret = wait_for_ts_release(); + if (ret != 0) + perror("wait_for_ts_release()"); + } + ret = execvp(info->exec_path, info->argv); + perror("execv failed"); + return ret; +} + +void usage(char *error) { + fprintf(stderr, "%s\nUsage: rt_launch [-w] task_parameters_file " + "program [arg1 arg2 ...]\n" + "\t-w\tSynchronous release\n" + "\tprogram to be launched\n", + 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) { + + printf("slice(tid, cpu, d, e, ph) = (%d, %u, %lf, %lf, %lf)\n", + tid, cpu, deadline, budget, offset); + + 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); + } + if (ferror(ts)) { + fprintf(stderr, "Cannot read file\n"); + return -1; + } + } + return 1; +} + +/* 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 (ret != EOF) { + + printf("(tid, wcet, period, ph, cpu, slices) = " + "(%d, %.2f, %.2f, %.2f, %u, %u)\n", + task_id, fwcet, fperiod, fphase, cpu, sliceno); + + 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; + if (sliceno > 0) { + ret = parse_edfwm_slice(ts, sliceno, task_id, + (struct edf_wm_params*) &rt->semi_part); + if (ret < 0) + goto err; + } + } + if (ferror(ts)) + goto err; + + return EOF; + +err: + fprintf(stderr, "Error parsing file\n"); + return -1; +} + +#define OPTSTR "w" + +int main(int argc, char** argv) +{ + int ret; + int wait = 0; + int opt; + startup_info_t info; + + struct rt_task rt; + FILE *file; + + while ((opt = getopt(argc, argv, OPTSTR)) != -1) { + switch (opt) { + case 'w': + wait = 1; + break; + case ':': + usage("Argument missing."); + break; + case '?': + default: + usage("Bad argument."); + break; + } + } + + signal(SIGUSR1, SIG_IGN); + + if (argc - optind < 2) + usage("Arguments missing."); + + if ((file = fopen(argv[optind + 0], "r")) == NULL) { + fprintf(stderr, "Cannot open %s\n", argv[1]); + return -1; + } + + memset(&rt, 0, sizeof(struct rt_task)); + + while (parse_edfwm_ts_file(file, &rt) != EOF) { + + if (sporadic_task_ns_semi(&rt) < 0) + bail_out("could not setup rt task params"); + } + + fclose(file); + + info.exec_path = argv[optind + 1]; + info.argv = argv + optind + 1; + info.wait = wait; + + ret = create_rt_task_semi(launch, &info, &rt); + + if (ret < 0) + bail_out("could not create rt child process"); + + return 0; +} diff --git a/include/litmus.h b/include/litmus.h index de7301d..2b499da 100644 --- a/include/litmus.h +++ b/include/litmus.h @@ -89,6 +89,11 @@ typedef int (*rt_fn_t)(void*); int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period); int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period, task_class_t cls); +/* wrapper to mask __launch_rt_task() for semi-partitioned algorithms + * (it can be extended to cover all algorithms that directly submit + * an rt_task structure instead of a set of values). + */ +int create_rt_task_semi(rt_fn_t rt_prog, void *arg, struct rt_task *params); /* per-task modes */ enum rt_task_mode_t { diff --git a/src/task.c b/src/task.c index 4d237bd..2f825ee 100644 --- a/src/task.c +++ b/src/task.c @@ -60,6 +60,11 @@ int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period) { return __create_rt_task(rt_prog, arg, cpu, wcet, period, RT_CLASS_HARD); } +int create_rt_task_semi(rt_fn_t rt_prog, void *arg, struct rt_task *params) +{ + return __launch_rt_task(rt_prog, arg, + (rt_setup_fn_t) set_rt_task_param, params); +} #define SCHED_NORMAL 0 #define SCHED_LITMUS 6 -- cgit v1.2.2 From fb20857266b1b77896d9ff7eb98733f8906ffaca Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 13:15:14 -0400 Subject: Properly fill structure before passing pointer. --- bin/rt_launch_edfwm.c | 15 ++++++++------- bin/rtspin_edfwm.c | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/bin/rt_launch_edfwm.c b/bin/rt_launch_edfwm.c index de65585..9ef3880 100644 --- a/bin/rt_launch_edfwm.c +++ b/bin/rt_launch_edfwm.c @@ -52,9 +52,6 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu, &deadline, &budget, &offset) != EOF) { - printf("slice(tid, cpu, d, e, ph) = (%d, %u, %lf, %lf, %lf)\n", - tid, cpu, deadline, budget, offset); - if (task_id != tid) { fprintf(stderr, "task_id %d != tid %d\n", task_id, tid); @@ -64,6 +61,9 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, 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"); @@ -95,17 +95,18 @@ int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) if (ret != EOF) { - printf("(tid, wcet, period, ph, cpu, slices) = " - "(%d, %.2f, %.2f, %.2f, %u, %u)\n", - task_id, fwcet, fperiod, fphase, cpu, sliceno); - 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) diff --git a/bin/rtspin_edfwm.c b/bin/rtspin_edfwm.c index 9a78aa3..11216fe 100644 --- a/bin/rtspin_edfwm.c +++ b/bin/rtspin_edfwm.c @@ -149,9 +149,6 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, if (fscanf(ts, "%d %u %lf %lf %lf\n", &tid, &cpu, &deadline, &budget, &offset) != EOF) { - printf("slice(tid, cpu, d, e, ph) = (%d, %u, %lf, %lf, %lf)\n", - tid, cpu, deadline, budget, offset); - if (task_id != tid) { fprintf(stderr, "task_id %d != tid %d\n", task_id, tid); @@ -161,6 +158,10 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, 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"); @@ -192,17 +193,18 @@ int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) if (ret != EOF) { - printf("(tid, wcet, period, ph, cpu, slices) = " - "(%d, %.2f, %.2f, %.2f, %u, %u)\n", - task_id, fwcet, fperiod, fphase, cpu, sliceno); - 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) @@ -247,7 +249,7 @@ int main(int argc, char** argv) test_loop = 1; break; case 'd': - /* manually configure delay per loop iteration + /* manually configure delay per loop iteration * unit: microseconds */ loop_length = atof(optarg) / 1000000; skip_config = 1; -- cgit v1.2.2 From ae4a6053d139fb55aa091484701117459000c447 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 13:41:43 -0400 Subject: Correclty invoking set_rt_param syscall. --- bin/rt_launch_edfwm.c | 46 +++++++++++++++++++++++----------------------- bin/rtspin_edfwm.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/bin/rt_launch_edfwm.c b/bin/rt_launch_edfwm.c index 9ef3880..b5a972c 100644 --- a/bin/rt_launch_edfwm.c +++ b/bin/rt_launch_edfwm.c @@ -70,7 +70,7 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, return -1; } } - return 1; + return 0; } /* Custom format to read parameters for tasks from a plain text file: @@ -93,30 +93,29 @@ int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) ret = fscanf(ts, "%d %lf %lf %lf %d %d\n", &task_id, &fwcet, &fperiod, &fphase, &cpu, &sliceno); - if (ret != EOF) { + 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; + 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) = " + 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, + + 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; - } + if (ret < 0) + goto err; } - if (ferror(ts)) - goto err; - return EOF; + return 0; err: fprintf(stderr, "Error parsing file\n"); @@ -125,7 +124,7 @@ err: #define OPTSTR "w" -int main(int argc, char** argv) +int main(int argc, char** argv) { int ret; int wait = 0; @@ -162,11 +161,11 @@ int main(int argc, char** argv) memset(&rt, 0, sizeof(struct rt_task)); - while (parse_edfwm_ts_file(file, &rt) != EOF) { + if (parse_edfwm_ts_file(file, &rt) < 0) + bail_out("Could not parse file\n"); - if (sporadic_task_ns_semi(&rt) < 0) - bail_out("could not setup rt task params"); - } + if (sporadic_task_ns_semi(&rt) < 0) + bail_out("could not setup rt task params"); fclose(file); @@ -181,3 +180,4 @@ int main(int argc, char** argv) return 0; } + diff --git a/bin/rtspin_edfwm.c b/bin/rtspin_edfwm.c index 11216fe..200fb4c 100644 --- a/bin/rtspin_edfwm.c +++ b/bin/rtspin_edfwm.c @@ -168,7 +168,7 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, return -1; } } - return 1; + return 0; } /* Custom format to read parameters for tasks from a plain text file: @@ -191,30 +191,28 @@ int parse_edfwm_ts_file(FILE *ts, struct rt_task *rt) ret = fscanf(ts, "%d %lf %lf %lf %d %d\n", &task_id, &fwcet, &fperiod, &fphase, &cpu, &sliceno); - if (ret != EOF) { + 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; + 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) = " + 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, + 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; - } + if (ret < 0) + goto err; } - if (ferror(ts)) - goto err; - return EOF; + return 0; err: fprintf(stderr, "Error parsing file\n"); @@ -287,11 +285,11 @@ int main(int argc, char** argv) memset(&rt, 0, sizeof(struct rt_task)); - while (parse_edfwm_ts_file(file, &rt) != EOF) { + if (parse_edfwm_ts_file(file, &rt) < 0) + bail_out("Could not parse file\n"); - if (sporadic_task_ns_semi(&rt) < 0) - bail_out("could not setup rt task params"); - } + if (sporadic_task_ns_semi(&rt) < 0) + bail_out("could not setup rt task params"); fclose(file); -- cgit v1.2.2 From 41f48372a8f86cb60d770832e0436016f5a6136c 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 From 07bb687f557a9672fe221a95834907d51cada4f9 Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Wed, 22 Sep 2010 14:26:03 -0400 Subject: bugfix: need to set the CPU of a slice --- bin/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/common.c b/bin/common.c index 1cf5be0..9cb577b 100644 --- a/bin/common.c +++ b/bin/common.c @@ -57,6 +57,7 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, wm->slices[i].deadline = fms_to_ns(deadline); wm->slices[i].budget = fms_to_ns(budget); wm->slices[i].offset = fms_to_ns(offset); + wm->slices[i].cpu = cpu; printf("slice(tid, cpu, d, e, ph) = (%d, %u, %llu, %llu, %llu)\n", tid, cpu, wm->slices[i].deadline, -- cgit v1.2.2 From 6fc64ec121241607139ecef9ec2bd9be16603dde Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Wed, 22 Sep 2010 14:36:02 -0400 Subject: avoid inconsistencies in the task parameters Floating point conversions introduce rounding errors. Fix-up the total execution cost as the sum of individual budgets. --- bin/common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/common.c b/bin/common.c index 9cb577b..b43ebf3 100644 --- a/bin/common.c +++ b/bin/common.c @@ -37,12 +37,16 @@ void bail_out(const char* msg) * . */ 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, @@ -62,6 +66,8 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, 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); + + total_budget += wm->slices[i].budget; } if (ferror(ts)) { @@ -70,6 +76,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; } @@ -101,8 +108,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; } -- cgit v1.2.2 From 104d98393aa46c6b1add0c73b7736a65af5c214e Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Wed, 22 Sep 2010 14:47:44 -0400 Subject: Enforce minimum budget in every slice. --- bin/common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/common.c b/bin/common.c index 9cb577b..ece9849 100644 --- a/bin/common.c +++ b/bin/common.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "common.h" @@ -21,7 +22,7 @@ void bail_out(const char* msg) * 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. @@ -62,6 +63,13 @@ int parse_edfwm_slice(FILE *ts, int slices_no, int task_id, 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 (wm->slices[i].budget < MIN_EDF_WM_SLICE_SIZE) { + + fprintf(stderr, "Slice %llu is too small\n", + wm->slices[i].budget); + return -1; + } } if (ferror(ts)) { -- cgit v1.2.2