aboutsummaryrefslogtreecommitdiffstats
path: root/litmus
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2013-01-18 11:00:14 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2013-01-18 11:00:14 -0500
commitc1cda76c0cfb184ab241c5fbde66f7ca92da8e79 (patch)
treeadbde26904faab8662c70aa7fb224383165c7534 /litmus
parent92801864bece1ccab9cc8b3ad73c1edb667a27fb (diff)
Remove tasklet::owner field (just commented out).
Diffstat (limited to 'litmus')
-rw-r--r--litmus/litmus_softirq.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/litmus/litmus_softirq.c b/litmus/litmus_softirq.c
index 666ea7ed1cb1..a5d61afe7952 100644
--- a/litmus/litmus_softirq.c
+++ b/litmus/litmus_softirq.c
@@ -255,7 +255,7 @@ int launch_klmirqd_thread(char* name, int cpu, klmirqd_callback_t* cb)
255 255
256 256
257 257
258#define KLMIRQD_SLICE_NR_JIFFIES 1 258#define KLMIRQD_SLICE_NR_JIFFIES 4
259#define KLMIRQD_SLICE_NS ((NSEC_PER_SEC / HZ) * KLMIRQD_SLICE_NR_JIFFIES) 259#define KLMIRQD_SLICE_NS ((NSEC_PER_SEC / HZ) * KLMIRQD_SLICE_NR_JIFFIES)
260 260
261static int become_litmus_daemon(struct task_struct* tsk) 261static int become_litmus_daemon(struct task_struct* tsk)
@@ -263,7 +263,7 @@ static int become_litmus_daemon(struct task_struct* tsk)
263 int ret = 0; 263 int ret = 0;
264 264
265 struct rt_task tp = { 265 struct rt_task tp = {
266 .period = KLMIRQD_SLICE_NS, /* dummy 1 second period */ 266 .period = KLMIRQD_SLICE_NS,
267 .relative_deadline = KLMIRQD_SLICE_NS, 267 .relative_deadline = KLMIRQD_SLICE_NS,
268 .exec_cost = KLMIRQD_SLICE_NS, 268 .exec_cost = KLMIRQD_SLICE_NS,
269 .phase = 0, 269 .phase = 0,
@@ -607,7 +607,7 @@ static void do_lit_tasklet(struct klmirqd_info* which,
607 if (tasklet_trylock(t)) { 607 if (tasklet_trylock(t)) {
608 if (!atomic_read(&t->count)) { 608 if (!atomic_read(&t->count)) {
609 609
610 sched_trace_tasklet_begin(t->owner); 610 sched_trace_tasklet_begin(NULL);
611 611
612 if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) 612 if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
613 { 613 {
@@ -619,7 +619,7 @@ static void do_lit_tasklet(struct klmirqd_info* which,
619 619
620 atomic_dec(count); 620 atomic_dec(count);
621 621
622 sched_trace_tasklet_end(t->owner, 0ul); 622 sched_trace_tasklet_end(NULL, 0ul);
623 623
624 continue; /* process more tasklets */ 624 continue; /* process more tasklets */
625 } 625 }
@@ -883,7 +883,7 @@ void flush_pending(struct task_struct* tsk)
883 883
884 work_flushed |= LIT_TASKLET_HI; 884 work_flushed |= LIT_TASKLET_HI;
885 885
886 t->owner = NULL; 886// t->owner = NULL;
887 887
888 // WTF? 888 // WTF?
889 if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) 889 if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state))
@@ -923,7 +923,7 @@ void flush_pending(struct task_struct* tsk)
923 923
924 work_flushed |= LIT_TASKLET_LOW; 924 work_flushed |= LIT_TASKLET_LOW;
925 925
926 t->owner = NULL; 926// t->owner = NULL;
927// sched_trace_tasklet_end(owner, 1ul); 927// sched_trace_tasklet_end(owner, 1ul);
928 928
929 if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) 929 if(!test_and_set_bit(TASKLET_STATE_SCHED, &t->state))