From e9fc09f4bd2bae682cea6e7155aad1fe3f58e77b Mon Sep 17 00:00:00 2001 From: Jonathan Herman Date: Sat, 29 Sep 2012 13:05:45 -0400 Subject: Resolved merge bugs. --- litmus/Makefile | 34 +++++++++++++++------------------- litmus/litmus.c | 2 ++ litmus/locking.c | 10 ---------- litmus/rt_domain.c | 2 -- litmus/sched_litmus.c | 5 ----- litmus/sched_mc.c | 20 ++++++++++++-------- 6 files changed, 29 insertions(+), 44 deletions(-) (limited to 'litmus') diff --git a/litmus/Makefile b/litmus/Makefile index b406cf2ad9e1..cea8a2572bd3 100644 --- a/litmus/Makefile +++ b/litmus/Makefile @@ -3,33 +3,29 @@ # obj-y = sched_plugin.o litmus.o \ - preempt.o \ - litmus_proc.o \ + bheap.o \ budget.o \ clustered.o \ - jobs.o \ - sync.o \ - rt_domain.o \ - edf_common.o \ - fdso.o \ - locking.o \ - srp.o \ - bheap.o \ - ctrldev.o \ - domain.o \ - sched_psn_edf.o \ - sched_gsn_edf.o color.o \ - color_proc.o \ color_dev.o \ - rt_server.o \ + color_proc.o \ + ctrldev.o \ dgl.o \ + domain.o \ + edf_common.o \ + fdso.o \ fifo_common.o \ + jobs.o \ + litmus_proc.o \ + locking.o \ + preempt.o \ rm_common.o \ + rt_domain.o \ + rt_server.o \ + sched_gsn_edf.o \ sched_psn_edf.o \ - sched_gsn_edf.o - - + srp.o \ + sync.o obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o diff --git a/litmus/litmus.c b/litmus/litmus.c index b76e1496d7f4..7d20dd1be493 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c @@ -24,6 +24,8 @@ #include #else struct mc_task; +#endif + #ifdef CONFIG_SCHED_CPU_AFFINITY #include #endif diff --git a/litmus/locking.c b/litmus/locking.c index e051a288aba0..4881ca119acf 100644 --- a/litmus/locking.c +++ b/litmus/locking.c @@ -75,10 +75,6 @@ asmlinkage long sys_litmus_lock(int lock_od) struct od_table_entry* entry; struct litmus_lock* l; - TS_SYSCALL_IN_START; - - TS_SYSCALL_IN_END; - TS_LOCK_START; entry = get_entry_for_od(lock_od); @@ -101,10 +97,6 @@ asmlinkage long sys_litmus_unlock(int lock_od) struct od_table_entry* entry; struct litmus_lock* l; - TS_SYSCALL_IN_START; - - TS_SYSCALL_IN_END; - TS_UNLOCK_START; entry = get_entry_for_od(lock_od); @@ -118,8 +110,6 @@ asmlinkage long sys_litmus_unlock(int lock_od) * account when computing overheads. */ TS_UNLOCK_END; - TS_SYSCALL_OUT_START; - return err; } diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c index 79243f92edbe..faf876623d62 100644 --- a/litmus/rt_domain.c +++ b/litmus/rt_domain.c @@ -57,8 +57,6 @@ static void do_release(struct release_heap *rh) TS_LVLB_RELEASE_START; else TS_LVLC_RELEASE_START; - struct release_heap* rh; - rh = container_of(timer, struct release_heap, timer); TS_RELEASE_LATENCY(rh->release_time); diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c index 39673ab6c7cd..3de3c8605aae 100644 --- a/litmus/sched_litmus.c +++ b/litmus/sched_litmus.c @@ -194,9 +194,6 @@ static void dequeue_task_litmus(struct rq *rq, struct task_struct *p, static void yield_task_litmus(struct rq *rq) { - TS_SYSCALL_IN_START; - - TS_SYSCALL_OUT_END; BUG_ON(rq->curr != current); /* sched_yield() is called to trigger delayed preemptions. * Thus, mark the current task as needing to be rescheduled. @@ -205,8 +202,6 @@ static void yield_task_litmus(struct rq *rq) */ clear_exit_np(current); litmus_reschedule_local(); - - TS_SYSCALL_OUT_START; } /* Plugins are responsible for this. diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c index 41f02ee3e6ca..2f4eb82b2220 100644 --- a/litmus/sched_mc.c +++ b/litmus/sched_mc.c @@ -309,7 +309,8 @@ static void link_task_to_crit(struct crit_entry *ce, update_ghost_time(ce->linked); } } - sched_trace_server_switch_away(sid(ce), 0, ce->linked->pid); + sched_trace_server_switch_away(sid(ce), 0, ce->linked->pid, + tsk_rt(ce->linked)->job_params.job_no); } /* Actually link task */ @@ -326,9 +327,10 @@ static void link_task_to_crit(struct crit_entry *ce, tsk_mc_data(task)->mc_job.ghost_budget; arm_ghost(ce, when_to_fire); - sched_trace_server_switch_to(sid(ce), 0, 0); + sched_trace_server_switch_to(sid(ce), 0, 0, 0); } else { - sched_trace_server_switch_to(sid(ce), 0, task->pid); + sched_trace_server_switch_to(sid(ce), 0, task->pid, + get_rt_job(ce->linked)); } } } @@ -435,14 +437,16 @@ static void link_task_to_cpu(struct cpu_entry *entry, struct task_struct *task) if (entry->linked) { sched_trace_server_switch_away(-entry->linked->pid, get_server_job(entry->linked), - entry->linked->pid); + entry->linked->pid, + get_rt_job(entry->linked)); } if (task){ set_rt_flags(task, RT_F_RUNNING); sched_trace_server_switch_to(-task->pid, get_server_job(task), - task->pid); + task->pid, + get_rt_job(task)); } entry->linked = task; @@ -1184,7 +1188,7 @@ static void mc_release_ts(lt_t time) strcpy(name, "LVL-A"); for_each_online_cpu(cpu) { entry = &per_cpu(cpus, cpu); - trace_litmus_container_param(++cont_id, &name); + trace_litmus_container_param(++cont_id, (const char*)&name); ce = &entry->crit_entries[level]; sched_trace_server_param(sid(ce), cont_id, 0, 0); } @@ -1193,14 +1197,14 @@ static void mc_release_ts(lt_t time) strcpy(name, "LVL-B"); for_each_online_cpu(cpu) { entry = &per_cpu(cpus, cpu); - trace_litmus_container_param(++cont_id, &name); + trace_litmus_container_param(++cont_id, (const char*)&name); ce = &entry->crit_entries[level]; sched_trace_server_param(sid(ce), cont_id, 0, 0); } level = CRIT_LEVEL_C; strcpy(name, "LVL-C"); - trace_litmus_container_param(++cont_id, &name); + trace_litmus_container_param(++cont_id, (const char*)&name); for_each_online_cpu(cpu) { entry = &per_cpu(cpus, cpu); ce = &entry->crit_entries[level]; -- cgit v1.2.2