aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2014-01-17 16:50:37 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2014-01-17 16:50:37 -0500
commit2b8387eb6535a1ebcfec9224fbf4f3837daf380d (patch)
tree0d1908ce01d5f162ce37c3bf83ce4fb14316cfe4
parente121b41ebcfa1ce83ab77fc93e7fdbb1f522437e (diff)
BUG: Trace IDs don't include ASSIGNED
-rw-r--r--include/litmus/sched_trace.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 8e2aefecd1fe..c30a80a69333 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -225,23 +225,25 @@ feather_callback void do_sched_trace_pgm_release(unsigned long id,
225 trace_litmus_task_release(t); \ 225 trace_litmus_task_release(t); \
226 } while (0) 226 } while (0)
227 227
228/* place holder for sched_trace_task_assigned (+4) */
229
228#define sched_trace_task_switch_to(t) \ 230#define sched_trace_task_switch_to(t) \
229 do { \ 231 do { \
230 SCHED_TRACE(SCHED_TRACE_BASE_ID + 4, \ 232 SCHED_TRACE(SCHED_TRACE_BASE_ID + 5, \
231 do_sched_trace_task_switch_to, t); \ 233 do_sched_trace_task_switch_to, t); \
232 trace_litmus_switch_to(t); \ 234 trace_litmus_switch_to(t); \
233 } while (0) 235 } while (0)
234 236
235#define sched_trace_task_switch_away(t) \ 237#define sched_trace_task_switch_away(t) \
236 do { \ 238 do { \
237 SCHED_TRACE(SCHED_TRACE_BASE_ID + 5, \ 239 SCHED_TRACE(SCHED_TRACE_BASE_ID + 6, \
238 do_sched_trace_task_switch_away, t); \ 240 do_sched_trace_task_switch_away, t); \
239 trace_litmus_switch_away(t); \ 241 trace_litmus_switch_away(t); \
240 } while (0) 242 } while (0)
241 243
242#define sched_trace_task_completion(t, forced) \ 244#define sched_trace_task_completion(t, forced) \
243 do { \ 245 do { \
244 SCHED_TRACE2(SCHED_TRACE_BASE_ID + 6, \ 246 SCHED_TRACE2(SCHED_TRACE_BASE_ID + 7, \
245 do_sched_trace_task_completion, t, \ 247 do_sched_trace_task_completion, t, \
246 (unsigned long) forced); \ 248 (unsigned long) forced); \
247 trace_litmus_task_completion(t, forced); \ 249 trace_litmus_task_completion(t, forced); \
@@ -249,40 +251,40 @@ feather_callback void do_sched_trace_pgm_release(unsigned long id,
249 251
250#define sched_trace_task_block(t) \ 252#define sched_trace_task_block(t) \
251 do { \ 253 do { \
252 SCHED_TRACE(SCHED_TRACE_BASE_ID + 7, \ 254 SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \
253 do_sched_trace_task_block, t); \ 255 do_sched_trace_task_block, t); \
254 trace_litmus_task_block(t); \ 256 trace_litmus_task_block(t); \
255 } while (0) 257 } while (0)
256 258
257#define sched_trace_task_resume(t) \ 259#define sched_trace_task_resume(t) \
258 do { \ 260 do { \
259 SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \ 261 SCHED_TRACE(SCHED_TRACE_BASE_ID + 9, \
260 do_sched_trace_task_resume, t); \ 262 do_sched_trace_task_resume, t); \
261 trace_litmus_task_resume(t); \ 263 trace_litmus_task_resume(t); \
262 } while (0) 264 } while (0)
263 265
264#define sched_trace_action(t, action) \ 266#define sched_trace_action(t, action) \
265 SCHED_TRACE2(SCHED_TRACE_BASE_ID + 9, \ 267 SCHED_TRACE2(SCHED_TRACE_BASE_ID + 10, \
266 do_sched_trace_action, t, (unsigned long) action); 268 do_sched_trace_action, t, (unsigned long) action);
267 269
268/* when is a pointer, it does not need an explicit cast to unsigned long */ 270/* when is a pointer, it does not need an explicit cast to unsigned long */
269#define sched_trace_sys_release(when) \ 271#define sched_trace_sys_release(when) \
270 do { \ 272 do { \
271 SCHED_TRACE(SCHED_TRACE_BASE_ID + 10, \ 273 SCHED_TRACE(SCHED_TRACE_BASE_ID + 11, \
272 do_sched_trace_sys_release, when); \ 274 do_sched_trace_sys_release, when); \
273 trace_litmus_sys_release(when); \ 275 trace_litmus_sys_release(when); \
274 } while (0) 276 } while (0)
275 277
276#define sched_trace_pgm_param(t) \ 278#define sched_trace_pgm_param(t) \
277 do { \ 279 do { \
278 SCHED_TRACE(SCHED_TRACE_BASE_ID + 11, \ 280 SCHED_TRACE(SCHED_TRACE_BASE_ID + 12, \
279 do_sched_trace_pgm_param, t); \ 281 do_sched_trace_pgm_param, t); \
280 trace_litmus_pgm_param(t); \ 282 trace_litmus_pgm_param(t); \
281 } while (0) 283 } while (0)
282 284
283#define sched_trace_pgm_release(t) \ 285#define sched_trace_pgm_release(t) \
284 do { \ 286 do { \
285 SCHED_TRACE(SCHED_TRACE_BASE_ID + 12, \ 287 SCHED_TRACE(SCHED_TRACE_BASE_ID + 13, \
286 do_sched_trace_pgm_release, t); \ 288 do_sched_trace_pgm_release, t); \
287 trace_litmus_pgm_release(t); \ 289 trace_litmus_pgm_release(t); \
288 } while (0) 290 } while (0)