diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2011-10-11 15:32:49 -0400 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2011-10-11 15:32:49 -0400 |
commit | eeaec489f3c4d9385c09aaff735b1444682c85d7 (patch) | |
tree | 57d0bfbca4888dc9a6e4cd8ccce7d0dc1e39a0e3 | |
parent | fc509f9abd444f6a75b1d0e27c6bec5eadecd823 (diff) |
Added task level to records
-rw-r--r-- | include/litmus/sched_mc.h | 1 | ||||
-rw-r--r-- | include/litmus/sched_trace.h | 3 | ||||
-rw-r--r-- | litmus/sched_task_trace.c | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h index 0a1b3f0c718c..740cc11be5d7 100644 --- a/include/litmus/sched_mc.h +++ b/include/litmus/sched_mc.h | |||
@@ -34,6 +34,7 @@ struct mc_data { | |||
34 | #define tsk_mc_data(t) (tsk_rt(t)->mc_data) | 34 | #define tsk_mc_data(t) (tsk_rt(t)->mc_data) |
35 | #define tsk_mc_crit(t) (tsk_mc_data(t)->mc_task.crit) | 35 | #define tsk_mc_crit(t) (tsk_mc_data(t)->mc_task.crit) |
36 | #define is_ghost(t) (tsk_mc_data(t)->mc_job.is_ghost) | 36 | #define is_ghost(t) (tsk_mc_data(t)->mc_job.is_ghost) |
37 | |||
37 | #define TS "(%s/%d:%d:%s)" | 38 | #define TS "(%s/%d:%d:%s)" |
38 | #define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : t->comm \ | 39 | #define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : t->comm \ |
39 | : t->comm : "NULL", \ | 40 | : t->comm : "NULL", \ |
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h index 7179fc2745ad..5cc05be8332f 100644 --- a/include/litmus/sched_trace.h +++ b/include/litmus/sched_trace.h | |||
@@ -24,7 +24,8 @@ struct st_param_data { /* regular params */ | |||
24 | u32 phase; | 24 | u32 phase; |
25 | u8 partition; | 25 | u8 partition; |
26 | u8 class; | 26 | u8 class; |
27 | u8 __unused[2]; | 27 | u8 level; |
28 | u8 __unused[1]; | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | struct st_release_data { /* A job is was/is going to be released. */ | 31 | struct st_release_data { /* A job is was/is going to be released. */ |
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c index 5ef8d09ab41f..768a2a0f9d2f 100644 --- a/litmus/sched_task_trace.c +++ b/litmus/sched_task_trace.c | |||
@@ -14,7 +14,11 @@ | |||
14 | #include <litmus/sched_trace.h> | 14 | #include <litmus/sched_trace.h> |
15 | #include <litmus/feather_trace.h> | 15 | #include <litmus/feather_trace.h> |
16 | #include <litmus/ftdev.h> | 16 | #include <litmus/ftdev.h> |
17 | #include <litmus/rt_domain.h> | ||
18 | #include <litmus/domain.h> | ||
19 | #include <litmus/event_group.h> | ||
17 | 20 | ||
21 | #include <litmus/sched_mc.h> | ||
18 | 22 | ||
19 | #define NO_EVENTS (1 << CONFIG_SCHED_TASK_TRACE_SHIFT) | 23 | #define NO_EVENTS (1 << CONFIG_SCHED_TASK_TRACE_SHIFT) |
20 | 24 | ||
@@ -132,6 +136,7 @@ feather_callback void do_sched_trace_task_param(unsigned long id, unsigned long | |||
132 | rec->data.param.phase = get_rt_phase(t); | 136 | rec->data.param.phase = get_rt_phase(t); |
133 | rec->data.param.partition = get_partition(t); | 137 | rec->data.param.partition = get_partition(t); |
134 | rec->data.param.class = get_class(t); | 138 | rec->data.param.class = get_class(t); |
139 | rec->data.param.level = (tsk_mc_data(t) ? tsk_mc_crit(t) : -1); | ||
135 | put_record(rec); | 140 | put_record(rec); |
136 | } | 141 | } |
137 | } | 142 | } |