diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-30 18:26:21 -0400 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-30 18:26:21 -0400 |
commit | 696ff3d97e631739c21daf15d2f3484ee9b7cb02 (patch) | |
tree | 4baf76afa81806855751228cba54fac109d9397f /include/litmus/sched_trace.h | |
parent | e9fc09f4bd2bae682cea6e7155aad1fe3f58e77b (diff) | |
parent | fb90f3b6a8a604a9aed7249045bfed77ce42de5b (diff) |
Fixed sched_color run issues.
Diffstat (limited to 'include/litmus/sched_trace.h')
-rw-r--r-- | include/litmus/sched_trace.h | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h index 15909e530771..0e050ac3748c 100644 --- a/include/litmus/sched_trace.h +++ b/include/litmus/sched_trace.h | |||
@@ -196,21 +196,17 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id, | |||
196 | #define trace_litmus_switch_to(t) | 196 | #define trace_litmus_switch_to(t) |
197 | #define trace_litmus_switch_away(prev) | 197 | #define trace_litmus_switch_away(prev) |
198 | #define trace_litmus_task_completion(t, forced) | 198 | #define trace_litmus_task_completion(t, forced) |
199 | |||
199 | #define trace_litmus_task_block(t, i) | 200 | #define trace_litmus_task_block(t, i) |
200 | #define trace_litmus_task_resume(t, i) | 201 | #define trace_litmus_task_resume(t, i) |
201 | #define trace_litmus_sys_release(start) | 202 | #define trace_litmus_sys_release(start) |
202 | |||
203 | #define trace_litmus_task_exit(t) | 203 | #define trace_litmus_task_exit(t) |
204 | #define trace_litmus_task_tardy(t) | 204 | #define trace_litmus_task_tardy(t) |
205 | 205 | ||
206 | #define trace_litmus_resource_acquire(t, i); | ||
207 | #define trace_litmus_resource_release(t, i); | ||
208 | #define trace_litmus_priority_donate(t, d, i) | ||
209 | |||
210 | #define trace_litmus_container_param(cid, name) | 206 | #define trace_litmus_container_param(cid, name) |
211 | #define trace_litmus_server_param(sid, cid, wcet, time) | 207 | #define trace_litmus_server_param(sid, cid, wcet, time) |
212 | #define trace_litmus_server_switch_to(sid, job, tid, tjob) | 208 | #define trace_litmus_server_switch_to(sid, job, tid) |
213 | #define trace_litmus_server_switch_away(sid, job, tid, tjob) | 209 | #define trace_litmus_server_switch_away(sid, job, tid) |
214 | #define trace_litmus_server_release(sid, job, release, deadline) | 210 | #define trace_litmus_server_release(sid, job, release, deadline) |
215 | #define trace_litmus_server_completion(sid, job) | 211 | #define trace_litmus_server_completion(sid, job) |
216 | 212 | ||
@@ -260,20 +256,36 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id, | |||
260 | trace_litmus_task_completion(t, forced); \ | 256 | trace_litmus_task_completion(t, forced); \ |
261 | } while (0) | 257 | } while (0) |
262 | 258 | ||
263 | #define sched_trace_task_block(t, i) \ | 259 | #define sched_trace_task_block_on(t, i) \ |
264 | do { \ | 260 | do { \ |
265 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 7, \ | 261 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 7, \ |
266 | do_sched_trace_task_block, t); \ | 262 | do_sched_trace_task_block, t); \ |
267 | trace_litmus_task_block(t, i); \ | 263 | trace_litmus_task_block(t, i); \ |
268 | } while (0) | 264 | } while (0) |
269 | 265 | ||
270 | #define sched_trace_task_resume(t, i) \ | 266 | #define sched_trace_task_block(t) \ |
267 | sched_trace_task_block_on(t, 0) | ||
268 | |||
269 | #define sched_trace_task_resume_on(t, i) \ | ||
271 | do { \ | 270 | do { \ |
272 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \ | 271 | SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \ |
273 | do_sched_trace_task_resume, t); \ | 272 | do_sched_trace_task_resume, t); \ |
274 | trace_litmus_task_resume(t, i); \ | 273 | trace_litmus_task_resume(t, i); \ |
275 | } while (0) | 274 | } while (0) |
276 | 275 | ||
276 | #define sched_trace_task_resume(t) \ | ||
277 | sched_trace_task_resume_on(t, 0) | ||
278 | |||
279 | #define sched_trace_resource_acquire(t, i) \ | ||
280 | do { \ | ||
281 | trace_litmus_resource_acquire(t, i); \ | ||
282 | } while (0) | ||
283 | |||
284 | #define sched_trace_resource_released(t, i) \ | ||
285 | do { \ | ||
286 | trace_litmus_resource_released(t, i); \ | ||
287 | } while (0) | ||
288 | |||
277 | #define sched_trace_action(t, action) \ | 289 | #define sched_trace_action(t, action) \ |
278 | SCHED_TRACE2(SCHED_TRACE_BASE_ID + 9, \ | 290 | SCHED_TRACE2(SCHED_TRACE_BASE_ID + 9, \ |
279 | do_sched_trace_action, t, (unsigned long) action); | 291 | do_sched_trace_action, t, (unsigned long) action); |
@@ -305,21 +317,6 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id, | |||
305 | sched_trace_log_message("%d P%d [%s@%s:%d]: Took %llu\n\n", \ | 317 | sched_trace_log_message("%d P%d [%s@%s:%d]: Took %llu\n\n", \ |
306 | TRACE_ARGS, litmus_clock() - _qt_start) | 318 | TRACE_ARGS, litmus_clock() - _qt_start) |
307 | 319 | ||
308 | #define sched_trace_resource_acquire(t, i) \ | ||
309 | do { \ | ||
310 | trace_litmus_resource_acquire(t, i); \ | ||
311 | } while (0) | ||
312 | |||
313 | #define sched_trace_resource_release(t, i) \ | ||
314 | do { \ | ||
315 | trace_litmus_resource_release(t, i); \ | ||
316 | } while (0) | ||
317 | |||
318 | #define sched_trace_priority_donate(t, d, i) \ | ||
319 | do { \ | ||
320 | trace_litmus_priority_donate(t, d, i); \ | ||
321 | } while (0) | ||
322 | |||
323 | #define sched_trace_container_param(cid, name) \ | 320 | #define sched_trace_container_param(cid, name) \ |
324 | do { \ | 321 | do { \ |
325 | trace_litmus_container_param(cid, name); \ | 322 | trace_litmus_container_param(cid, name); \ |