diff --git a/pb_utils/mod_gen/Plan.pm b/pb_utils/mod_gen/Plan.pm index 9a6b9bdbc53b7b751d6a90f33df2ee1a5b3cd479..872335d95e936f9cbb5df04389f5779b2626ee06 100644 --- a/pb_utils/mod_gen/Plan.pm +++ b/pb_utils/mod_gen/Plan.pm @@ -14,10 +14,9 @@ sub parse_plan_csv while (<FILE>) { - if (/\s*(\d+)\s*,\s*(\d+)\s*/) + if (/\s*(\d+)\s*/) { push(@expected_results, {mode => 'EXEC', nr => $counter, time => $1}); - push(@expected_results, {mode => 'IDLE', nr => $counter, time => $2}); $counter++; } } diff --git a/pb_utils/mod_gen/plan_to_module.pl b/pb_utils/mod_gen/plan_to_module.pl index eddaab59f1bb164bdc1316c9b589ac8c3f5bf4ed..96a49dd0159d4c30cba515b8447aadc56b63a6c1 100755 --- a/pb_utils/mod_gen/plan_to_module.pl +++ b/pb_utils/mod_gen/plan_to_module.pl @@ -46,15 +46,14 @@ sub process_plan my @plan = parse_plan_csv ($plan_file); my @formatted_plan; - for (my $i = 0; $i < scalar @plan ; $i += 2) { + for (my $i = 0; $i < scalar @plan ; $i += 1) { if ($plan[$i]->{time} >= 20000000000) { print("ERROR: Watchdog will cause kernel panic!\n"); } push(@formatted_plan, { exec_t => $plan[$i]->{time}, - idle_t => $plan[$i+1]->{time}, - index => $i/2 + index => $i }); } diff --git a/pb_utils/mod_gen/plans/plan_same_v.csv b/pb_utils/mod_gen/plans/plan_same_v.csv index f042e6f8cac226526c6f983784d025c870f746b8..0a6b3d95fdc18ee8a14fbf731e738e761cf878cf 100644 --- a/pb_utils/mod_gen/plans/plan_same_v.csv +++ b/pb_utils/mod_gen/plans/plan_same_v.csv @@ -1,101 +1,100 @@ -EXEC_TIME, IDLE_TIME -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 1000000000 -1000000000 , 0 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 +821500 \ No newline at end of file diff --git a/pb_utils/mod_gen/plans/random_v.csv b/pb_utils/mod_gen/plans/random_v.csv index 5bff66d23b1e066781f534cc7aa63af8fae5808a..09040761214d728448be080f997212045e7bac01 100644 --- a/pb_utils/mod_gen/plans/random_v.csv +++ b/pb_utils/mod_gen/plans/random_v.csv @@ -1,3 +1,2 @@ -EXEC_TIME, IDLE_TIME -19900000000, 1900000000 -1000000000, 0 +825000 +150024 \ No newline at end of file diff --git a/pb_utils/mod_gen/tmpl/module.tt b/pb_utils/mod_gen/tmpl/module.tt index 068b6ee3b966a91f8f0b6d8ba21cc4386b8c59da..cd8827ebe9b3431d32fe83116bfb6b553a61652f 100644 --- a/pb_utils/mod_gen/tmpl/module.tt +++ b/pb_utils/mod_gen/tmpl/module.tt @@ -14,7 +14,6 @@ static int loop_thread_func(void *data) while (!kthread_should_stop()) { int a = 0; int b = 0; - set_current_state(TASK_INTERRUPTIBLE); for (;a < 200000; a++){b = b + a;} printk("b = %d\n", b); schedule(); diff --git a/pb_utils/pb_submitter/example_plan b/pb_utils/pb_submitter/example_plan index 83181673a10bdfac6b5dd4afc465b2154dda263b..93cbfb92e6c06a5dd76f0523e1e169c14f90e7c3 100644 --- a/pb_utils/pb_submitter/example_plan +++ b/pb_utils/pb_submitter/example_plan @@ -1,100 +1,100 @@ -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 -100000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000 +560000