From a4d08351aacc56e79b03c85fc9bbcb03567309fa Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Sat, 27 Oct 2007 15:47:22 -0400 Subject: cleanup: tidy up code before release This gets rid of quite a few FIXMEs and TODOs, as well as some cruft. --- include/linux/litmus.h | 23 +---------------------- include/linux/pfair_math.h | 3 +++ include/linux/sched_plugin.h | 8 -------- 3 files changed, 4 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/linux/litmus.h b/include/linux/litmus.h index dc39ecbf7e..259594e922 100644 --- a/include/linux/litmus.h +++ b/include/linux/litmus.h @@ -35,7 +35,6 @@ typedef enum { typedef enum { LITMUS_RESERVED_RANGE = 1024, - ENABLE_WEIGHT_CHANGE_SIGNAL } sched_setup_cmd_t; /* Runtime modes */ @@ -49,30 +48,14 @@ enum rt_mode_t { #define PLUGIN_PFAIR "pfair" #define PLUGIN_PART_EDF "part_edf" #define PLUGIN_GLOBAL_EDF "global_edf" -#define PLUGIN_PFAIR_STAGGER "stagger" -#define PLUGIN_PFAIR_DESYNC "desync" #define PLUGIN_GLOBAL_EDF_NP "global_edf_np" #define PLUGIN_EDF_HSB "edf_hsb" #define PLUGIN_GSN_EDF "gsn_edf" #define PLUGIN_PSN_EDF "psn_edf" #define PLUGIN_ADAPTIVE "adaptive" -/* Additional clone flags - Indicates that the thread is to be used in - realtime mode, therefore it should not be - woken up in a linux manner, - we just set its state to TASK_STOPPED - It must be prepared and added to the ready queue explicitly -*/ - -/* Type definition for our quantums */ -typedef unsigned long long quantum_t; - extern spolicy sched_policy; -extern unsigned long slot_size; -extern unsigned long stagger_offset; - /* RT mode start time */ extern volatile unsigned long rt_start_time; @@ -82,10 +65,6 @@ extern atomic_t rt_mode; #define get_rt_mode() (atomic_read(&rt_mode)) #define set_rt_mode(a) atomic_set(&rt_mode,(a)) -/* CLEANUP: Should be queue_lock, does it really belong here? */ -extern spinlock_t litmus_task_set_lock; - - #define TRACE(fmt, args...) \ sched_trace_log_message("%d: " fmt, raw_smp_processor_id(), ## args) @@ -99,7 +78,7 @@ extern spinlock_t litmus_task_set_lock; do { if (cond) TRACE("BUG_ON(%s) at %s:%d " \ "called from %p current=%s/%d state=%d " \ "flags=%x mode=%d partition=%d cpu=%d rtflags=%d"\ - " job=%u knp=%d timeslice=%u\n", \ + " job=%u knp=%d timeslice=%u\n", \ #cond, __FILE__, __LINE__, __builtin_return_address(0), current->comm, \ current->pid, current->state, current->flags, get_rt_mode(), \ get_partition(current), smp_processor_id(), get_rt_flags(current), \ diff --git a/include/linux/pfair_math.h b/include/linux/pfair_math.h index dab1778f0b..b2a14e4c54 100644 --- a/include/linux/pfair_math.h +++ b/include/linux/pfair_math.h @@ -7,6 +7,9 @@ #include #include +/* Type definition for our quantums */ +typedef unsigned long long quantum_t; + /* * This file defines mathematical functions "ceiling", "floor", * and PFAIR specific functions for computing the release and diff --git a/include/linux/sched_plugin.h b/include/linux/sched_plugin.h index fa0716f0eb..1ea8178b25 100644 --- a/include/linux/sched_plugin.h +++ b/include/linux/sched_plugin.h @@ -33,13 +33,6 @@ struct pi_semaphore { */ typedef void runqueue_t; -/********************* real-time callbacks ********************/ - -/* Special plugin shutdown hook that clear plugin data structures - Currently is not supported -*/ -typedef void (*plugin_shutdown_hook_t) (void); - /********************* scheduler invocation ******************/ @@ -105,7 +98,6 @@ struct sched_plugin { int ready_to_use; /* management interface */ - plugin_shutdown_hook_t shutdown_hook; /*currently unsupported */ mode_change_t mode_change; /* scheduler invocation */ -- cgit v1.2.2