1 files changed, 28 insertions, 25 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index e3cd78d29ce8..26f32d874916 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -293,7 +293,7 @@ static void donate_slack(server_t *donator, struct task_struct *was_scheduled)
         TRACE_SERVER_SUB(donator, "donated %llu slack", TIME(donator->budget));
         sched_trace_action(was_scheduled, 9);
         slack = server_alloc(GFP_ATOMIC);
-        server_init(slack, donator->id, donator->budget,
+        server_init(slack, &server_domain, donator->id, donator->budget,
                     donator->period, 0);
         slack->type = S_SLACK;
         server_release_at(slack, donator->release);
@@ -606,7 +606,7 @@ static noinline void link_server(cpu_entry_t *entry,
         }
 
         entry->linked_server = next_server;
-        server_run(entry->linked_server, entry->linked, &server_domain);
+        server_run(entry->linked_server, entry->linked);
 }
 
 /*
@@ -624,7 +624,7 @@ static noinline void unlink_server(cpu_entry_t *entry,
         if (!entry->linked_server)
                 return;
 
-        server_stop(entry->linked_server, &server_domain);
+        server_stop(entry->linked_server);
         now = litmus_clock();
 
         if (is_hrt(entry->linked) && !hrt_server->ready) {
@@ -837,8 +837,6 @@ static inline void catchup_server(server_t *server, lt_t time)
         lt_t diff = time - server->deadline;
         lt_t sub  = diff % server->period;
 
-        BUG_ON(server->running);
-
         server_release_at(server, time - sub);
         TRACE_SUB("catching up server %d to %llu",
                   server->id, server->deadline);
@@ -856,8 +854,9 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
         lt_t now = litmus_clock();
         struct task_struct *task = NULL;
 
-        /* Catch up server if it is late */
-        if (hrt_server->server.deadline && !hrt_server->server.running &&
+        /* Catch up server if it is initialized, not running, and late */
+        if (hrt_server->server.deadline &&
+            !is_server_linked(&hrt_server->server) &&
             lt_before_eq(hrt_server->server.deadline, now)) {
                 catchup_server(&hrt_server->server, now);
                 slack_timer_arm(hrt_server);
@@ -1659,7 +1658,8 @@ static int admit_be_server(unsigned long long wcet,
         }
 
         be_server = server_alloc(GFP_ATOMIC);
-        server_init(be_server, BE_SERVER_BASE + ++curr_be,
+        server_init(be_server, &server_domain,
+                    BE_SERVER_BASE + ++curr_be,
                     wcet, period, 1);
         be_server->type = S_BE;
 
@@ -1674,14 +1674,14 @@ static int admit_be_server(unsigned long long wcet,
 /*
  * Output all BE servers to a proc entry.
  */
-static void list_be_servers(struct proc_read_args *args)
+static void list_be_servers(server_proc_t *proc)
 {
         struct list_head *pos;
         server_t *be_server;
 
         list_for_each(pos, &be_servers) {
                 be_server = list_entry(pos, server_t, list);
-                server_proc_read_single(be_server, NO_CPU, args);
+                list_server(be_server, NO_CPU, proc);
         }
 }
 
@@ -1724,7 +1724,8 @@ static int admit_hrt_server(unsigned long long wcet,
 
         hrt_server->no_slack = 0;
 
-        server_init(&hrt_server->server, cpu, wcet, period, 1);
+        server_init(&hrt_server->server, &server_domain,
+                    cpu, wcet, period, 1);
         hrt_server->server.type = S_HRT;
 
         edf_domain_init(&hrt_server->hrt_domain, NULL,
@@ -1741,16 +1742,16 @@ static int admit_hrt_server(unsigned long long wcet,
 /*
  * Print all HRT servers to a proc entry.
  */
-static void list_hrt_servers(struct proc_read_args *args)
+static void list_hrt_servers(server_proc_t *proc)
 {
         cpu_entry_t     *entry;
         hrt_server_t    *hrt_server;
         int cpu;
 
         for_each_online_cpu(cpu) {
-                entry      = &per_cpu(cpu_entries, cpu);
+                entry = &per_cpu(cpu_entries, cpu);
                 hrt_server = &entry->hrt_server;
-                server_proc_read_single(&hrt_server->server, cpu, args);
+                list_server(&hrt_server->server, cpu, proc);
         }
 }
 
@@ -2048,7 +2049,8 @@ static void edf_hsb_task_new(struct task_struct *task, int on_rq,  int running)
         if (is_srt(task)) {
                 /* Create SRT server */
                 srt_server = server_alloc(GFP_ATOMIC);
-                server_init(srt_server, task->pid, get_exec_cost(task),
+                server_init(srt_server, &server_domain,
+                            task->pid, get_exec_cost(task),
                             get_rt_period(task), 0);
                 srt_server->type = S_SRT;
                 srt_server->data = task;
@@ -2157,13 +2159,6 @@ static int __init init_edf_hsb(void)
                 goto out;
         }
 
-        /* Server proc interfaces */
-        rv = server_proc_init(edf_hsb_proc_dir, BE_PROC_NAME,
-                              admit_be_server, list_be_servers,
-                              stop_be_servers);
-        rv = server_proc_init(edf_hsb_proc_dir, HRT_PROC_NAME,
-                              admit_hrt_server, list_hrt_servers,
-                              stop_hrt_servers);
 
         task_data_cache = KMEM_CACHE(task_data, SLAB_PANIC);
 
@@ -2174,6 +2169,17 @@ static int __init init_edf_hsb(void)
         server_domain_init(&server_domain, servers_released,
                            server_completed, NO_CPU, global_lock);
 
+        /* Server proc interfaces */
+        server_proc_init(&server_domain,
+                         edf_hsb_proc_dir, BE_PROC_NAME,
+                         admit_be_server, list_be_servers,
+                         stop_be_servers);
+        server_proc_init(&server_domain,
+                         edf_hsb_proc_dir, HRT_PROC_NAME,
+                         admit_hrt_server, list_hrt_servers,
+                         stop_hrt_servers);
+
+
         /* Global collections */
         bheap_init(&cpu_heap);
         bheap_init(&be_ready_servers);
@@ -2216,9 +2222,6 @@ static void exit_edf_hsb(void)
         stop_be_servers();
         stop_hrt_servers();
 
-        server_proc_exit(edf_hsb_proc_dir, BE_PROC_NAME);
-        server_proc_exit(edf_hsb_proc_dir, HRT_PROC_NAME);
-
         server_domain_destroy(&server_domain);
 
         for_each_online_cpu(cpu) {