rip out old junk

4 files changed, 0 insertions, 126 deletions

diff --git a/include/adaptive.h b/include/adaptive.h
deleted file mode 100644
index 360b13e..0000000
--- a/include/adaptive.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef ADAPTIVE_H
-#define ADAPTIVE_H
-
-#define FP_SHIFT 10
-typedef struct
-{
-        long val;
-} fp_t;
-
-static inline fp_t f2fp(double f)
-{
-        return (fp_t) {f * (1 << FP_SHIFT)};
-}
-
-static inline double fp2f(fp_t f)
-{
-        return ((double) f.val) / (1 << FP_SHIFT);
-}
-
-
-#define MAX_SERVICE_LEVELS 10
-typedef struct {
-        fp_t            weight;
-        unsigned long   period;
-        fp_t            value;
-} service_level_t;
-
-int set_service_levels(pid_t pid, 
-                       unsigned int nr_levels,
-                       service_level_t* levels);
-
-int get_cur_service_level(void);
-
-int create_adaptive_rt_task(rt_fn_t rt_prog, void *arg, 
-                            unsigned int no_levels, service_level_t* levels);
-
-
-#endif
diff --git a/include/edf-hsb.h b/include/edf-hsb.h
deleted file mode 100644
index 0ac3d4f..0000000
--- a/include/edf-hsb.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef EDF_HSB_H
-#define EDF_HSB_H
-
-
-int set_hrt(int cpu, unsigned int  wcet, unsigned int  period);
-int get_hrt(int cpu, unsigned int *wcet, unsigned int *period);
-int create_be(unsigned int wcet, unsigned int period);
-
-
-#endif
diff --git a/include/litmus.h b/include/litmus.h
index c3cd51d..8918ae9 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -6,20 +6,6 @@
 /* A real-time program. */
 typedef int (*rt_fn_t)(void*);
 
-/*      Litmus scheduling policies      */
-typedef enum {
-        SCHED_LINUX             =  0,
-        SCHED_PFAIR             =  1,
-        SCHED_PART_EDF          =  3,
-        SCHED_GLOBAL_EDF        =  5,
-        SCHED_PFAIR_DESYNC      =  6,
-        SCHED_GLOBAL_EDF_NP     =  7,   
-        SCHED_EDF_HSB           =  9,
-        SCHED_GSN_EDF           = 10,
-        SCHED_PSN_EDF           = 11,
-        SCHED_ADAPTIVE          = 12,
-} spolicy;
-
 /* different types of clients */
 typedef enum {
         RT_CLASS_HARD,  
@@ -48,12 +34,6 @@ typedef int pid_t;	 /* PID of a task */
 /* obtain the PID of a thread */
 pid_t gettid(void);
 
-/*      scheduler modes */
-#define MODE_NON_RT 0
-#define MODE_RT_RUN 1
-
-spolicy sched_getpolicy(void);
-int set_rt_mode(int mode);
 int set_rt_task_param(pid_t pid, rt_param_t* param);
 int get_rt_task_param(pid_t pid, rt_param_t* param);
 
@@ -66,18 +46,10 @@ int sporadic_task(unsigned long exec_cost, unsigned long period,
 #define sporadic_partitioned(e, p, cpu) \
         sporadic_task(e, p, cpu, RT_CLASS_SOFT)
 
-
-/* deprecated */
-enum {
-        LITMUS_RESERVED_RANGE = 1024,
-} SCHED_SETUP_CMD;
-int scheduler_setup(int cmd, void* param);
-
 /* file descriptor attached shared objects support */
 typedef enum  {
         PI_SEM          = 0,
         SRP_SEM         = 1,
-        ICS_ID          = 2,
 } obj_type_t;
 
 int od_openx(int fd, obj_type_t type, int obj_id, void* config);
@@ -100,34 +72,6 @@ int get_job_no(unsigned int* job_no);
 int wait_for_job_release(unsigned int job_no);
 int sleep_next_period(void);
 
-/* interruptible critical section support */
-#define MAX_ICS_NESTING         16
-#define ICS_STACK_EMPTY         (-1)
-
-struct ics_descriptor {
-        /* ICS id, only read by kernel */
-        int     id;
-        /* rollback program counter, only read by kernel */
-        void*   pc; 
-        /* rollback stack pointer, not used by kernel */
-        void*    sp;
-        /* retry flag, not used by kernel */
-        int*    retry;
-};
-
-/* ICS control block */
-struct ics_cb {
-        /* Points to the top-most valid entry.
-         * -1 indicates an empty stack.
-         * Read and written by kernel.
-         */
-        int                     top;    
-        struct ics_descriptor   ics_stack[MAX_ICS_NESTING];
-};
-
-int reg_ics_cb(struct ics_cb* ics_cb);
-int start_wcs(int od);
-
 /*  library functions */
 int  init_litmus(void);
 int  init_rt_thread(void);
@@ -144,7 +88,6 @@ enum rt_task_mode_t {
 };
 int task_mode(int target_mode);
 
-const char* get_scheduler_name(spolicy scheduler);
 void show_rt_param(rt_param_t* tp);
 task_class_t str2class(const char* str);
 
diff --git a/include/sched_trace.h b/include/sched_trace.h
index 1427107..5d2ddb3 100644
--- a/include/sched_trace.h
+++ b/include/sched_trace.h
@@ -17,9 +17,6 @@ typedef enum {
         ST_JOB_COMPLETION       =  6,
         ST_CAPACITY_RELEASE     =  7,
         ST_CAPACITY_ALLOCATION  =  8,
-        ST_SERVICE_LEVEL_CHANGE =  9,
-        ST_WEIGHT_ERROR         = 10,
-
 
         ST_MAX
 } trace_type_t;
@@ -96,24 +93,6 @@ typedef struct {
         pid_t                   donor;
 } cap_allocation_record_t;
 
-typedef struct {
-        trace_header_t          header;
-        task_info_t             task;
-        unsigned int            from:16;
-        unsigned int            to:16;
-        service_level_t         new_level;
-        service_level_t         old_level;
-} service_level_change_record_t;
-
-typedef struct {
-        trace_header_t          header;
-        pid_t                   task;
-        fp_t                    estimate;
-        fp_t                    actual;
-} weight_error_record_t;
-
-
-