summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchsun <chsun@mid-campus-02989.wireless.unc.edu>2011-04-17 18:27:08 -0400
committerchsun <chsun@mid-campus-02989.wireless.unc.edu>2011-04-17 18:27:08 -0400
commitac8db2137a45600f70cf56df3ca6f7515fa520da (patch)
tree7179a4af5c50cbd3020ab770653ac7b34d74b2cd
parent1157ce730e6450e259120a7ded0118ac7d9551f1 (diff)
Put Back ST_ACTIONwip-kernthreads-nv-trace
-rw-r--r--include/sched_trace.h8
-rw-r--r--src/util.c3
2 files changed, 11 insertions, 0 deletions
diff --git a/include/sched_trace.h b/include/sched_trace.h
index 610bfb0..0c6daaa 100644
--- a/include/sched_trace.h
+++ b/include/sched_trace.h
@@ -76,6 +76,12 @@ struct st_resume_data { /* A task resumes. */
76 u64 __unused; 76 u64 __unused;
77}; 77};
78 78
79struct st_action_data {
80 u64 when;
81 u8 action;
82 u8 __unused[7];
83};
84
79struct st_sys_release_data { 85struct st_sys_release_data {
80 u64 when; 86 u64 when;
81 u64 release; 87 u64 release;
@@ -148,6 +154,7 @@ typedef enum {
148 ST_COMPLETION, 154 ST_COMPLETION,
149 ST_BLOCK, 155 ST_BLOCK,
150 ST_RESUME, 156 ST_RESUME,
157 ST_ACTION,
151 ST_SYS_RELEASE, 158 ST_SYS_RELEASE,
152 ST_TASKLET_RELEASE, 159 ST_TASKLET_RELEASE,
153 ST_TASKLET_BEGIN, 160 ST_TASKLET_BEGIN,
@@ -174,6 +181,7 @@ struct st_event_record {
174 DATA(completion); 181 DATA(completion);
175 DATA(block); 182 DATA(block);
176 DATA(resume); 183 DATA(resume);
184 DATA(action);
177 DATA(sys_release); 185 DATA(sys_release);
178 DATA(tasklet_release); 186 DATA(tasklet_release);
179 DATA(tasklet_begin); 187 DATA(tasklet_begin);
diff --git a/src/util.c b/src/util.c
index 2aa6243..ac46a7d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -21,6 +21,7 @@ static const char* event_names[] = {
21 "COMPLETION", 21 "COMPLETION",
22 "BLOCK", 22 "BLOCK",
23 "RESUME", 23 "RESUME",
24 "ACTION"
24 "SYS_RELEASE", 25 "SYS_RELEASE",
25 "TASKLET_RELEASE", 26 "TASKLET_RELEASE",
26 "TASKLET_BEGIN", 27 "TASKLET_BEGIN",
@@ -55,6 +56,7 @@ u64 event_time(struct st_event_record* rec)
55 case ST_COMPLETION: 56 case ST_COMPLETION:
56 case ST_BLOCK: 57 case ST_BLOCK:
57 case ST_RESUME: 58 case ST_RESUME:
59 case ST_ACTION:
58 case ST_SYS_RELEASE: 60 case ST_SYS_RELEASE:
59 case ST_TASKLET_RELEASE: 61 case ST_TASKLET_RELEASE:
60 case ST_TASKLET_BEGIN: 62 case ST_TASKLET_BEGIN:
@@ -124,6 +126,7 @@ static print_t print_detail[] = {
124 print_nothing, /* COMPLETION */ 126 print_nothing, /* COMPLETION */
125 print_nothing, /* BLOCK */ 127 print_nothing, /* BLOCK */
126 print_nothing, /* RESUME */ 128 print_nothing, /* RESUME */
129 print_nothing, /* ACTION */
127 print_time_data2, /* SYS_RELEASE */ 130 print_time_data2, /* SYS_RELEASE */
128 print_time_data2, /*TASKLET_RELEASE*/ 131 print_time_data2, /*TASKLET_RELEASE*/
129 print_nothing, /* TASKLET_BEGIN */ 132 print_nothing, /* TASKLET_BEGIN */