diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-27 15:47:22 -0400 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-10-27 15:47:22 -0400 |
| commit | a4d08351aacc56e79b03c85fc9bbcb03567309fa (patch) | |
| tree | 8f15cd5c23a86c72c7376c3da8248e4850629b7f /kernel/sched_plugin.c | |
| parent | 2e4b97e2e722699fe2ce2699714887eac0ff84cc (diff) | |
cleanup: tidy up code before release2007.2
This gets rid of quite a few FIXMEs and TODOs, as well as some cruft.
Diffstat (limited to 'kernel/sched_plugin.c')
| -rw-r--r-- | kernel/sched_plugin.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/kernel/sched_plugin.c b/kernel/sched_plugin.c index 3c7d6c0842..1f759b7c9f 100644 --- a/kernel/sched_plugin.c +++ b/kernel/sched_plugin.c | |||
| @@ -9,14 +9,6 @@ | |||
| 9 | #include <linux/sched_plugin.h> | 9 | #include <linux/sched_plugin.h> |
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | /* These are the original Linux initialization functions. | ||
| 13 | * We replace them here with our initialization code and call them | ||
| 14 | * after setting up LITMUS. | ||
| 15 | */ | ||
| 16 | void linux_sched_init(void); | ||
| 17 | void linux_sched_init_smp(void); | ||
| 18 | int linux_migration_init(void); | ||
| 19 | |||
| 20 | /************************************************************* | 12 | /************************************************************* |
| 21 | * Dummy plugin functions * | 13 | * Dummy plugin functions * |
| 22 | *************************************************************/ | 14 | *************************************************************/ |
| @@ -99,7 +91,6 @@ sched_plugin_t linux_sched_plugin = { | |||
| 99 | .wake_up_task = litmus_dummy_wake_up_task, | 91 | .wake_up_task = litmus_dummy_wake_up_task, |
| 100 | .task_blocks = litmus_dummy_task_blocks, | 92 | .task_blocks = litmus_dummy_task_blocks, |
| 101 | .sleep_next_period = litmus_dummy_sleep_next_period, | 93 | .sleep_next_period = litmus_dummy_sleep_next_period, |
| 102 | .shutdown_hook = 0, | ||
| 103 | .schedule = litmus_dummy_schedule, | 94 | .schedule = litmus_dummy_schedule, |
| 104 | .finish_switch = litmus_dummy_finish_switch, | 95 | .finish_switch = litmus_dummy_finish_switch, |
| 105 | .scheduler_setup = litmus_dummy_scheduler_setup, | 96 | .scheduler_setup = litmus_dummy_scheduler_setup, |
| @@ -115,47 +106,3 @@ sched_plugin_t linux_sched_plugin = { | |||
| 115 | */ | 106 | */ |
| 116 | sched_plugin_t *curr_sched_plugin = &linux_sched_plugin; | 107 | sched_plugin_t *curr_sched_plugin = &linux_sched_plugin; |
| 117 | 108 | ||
| 118 | |||
| 119 | /* At sched-init */ | ||
| 120 | void __init sched_init(void) | ||
| 121 | { | ||
| 122 | printk("Entering custom sched init, plugin %s\n", | ||
| 123 | curr_sched_plugin->plugin_name); | ||
| 124 | /* Init tracing facility before plugin functions are called */ | ||
| 125 | |||
| 126 | /* CLEANUP: reenable this if needed | ||
| 127 | pstats = INIT_PSTATS; | ||
| 128 | |||
| 129 | */ | ||
| 130 | |||
| 131 | /* Call linux sched init tasks */ | ||
| 132 | linux_sched_init(); | ||
| 133 | printk("Sched init complete\n"); | ||
| 134 | } | ||
| 135 | |||
| 136 | void __init sched_init_smp(void) | ||
| 137 | { | ||
| 138 | printk("Entering custom SMP init, plugin %s\n", | ||
| 139 | curr_sched_plugin->plugin_name); | ||
| 140 | /* Call linux smp initializer */ | ||
| 141 | linux_sched_init_smp(); | ||
| 142 | /* Enable tracing facilities here */ | ||
| 143 | /* | ||
| 144 | CLEANUP: Reenable if needed. | ||
| 145 | if (smp_processor_id() == 0) { | ||
| 146 | if (init_trace()) { | ||
| 147 | printk("Tracing disabled\n"); | ||
| 148 | } else { | ||
| 149 | printk("Default tracing enabled\n"); | ||
| 150 | } | ||
| 151 | } */ | ||
| 152 | printk("Sched init SMP complete\n"); | ||
| 153 | } | ||
| 154 | |||
| 155 | int __init migration_init(void) | ||
| 156 | { | ||
| 157 | printk("Entering migration init\n"); | ||
| 158 | |||
| 159 | /* Call linux migration init as it was before */ | ||
| 160 | return linux_migration_init(); | ||
| 161 | } | ||
