diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2013-04-06 13:56:22 -0400 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2013-04-06 13:56:22 -0400 |
commit | 92d266b64e0def8554ebece70318a5ae0050573a (patch) | |
tree | a10f170121b45172df816a8d662024754cbbee5f /include/litmus | |
parent | 886c672274a1807d108d995438937e1ee1c4fe89 (diff) |
Implement OMLP-Family budget exhaustion hooks.
Diffstat (limited to 'include/litmus')
-rw-r--r-- | include/litmus/locking.h | 4 | ||||
-rw-r--r-- | include/litmus/rt_param.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/litmus/locking.h b/include/litmus/locking.h index 08b06200b955..4dd8c66868e6 100644 --- a/include/litmus/locking.h +++ b/include/litmus/locking.h | |||
@@ -242,10 +242,10 @@ int wake_up_for_lock(struct task_struct* t); | |||
242 | 242 | ||
243 | /* thread safe?? */ | 243 | /* thread safe?? */ |
244 | #ifndef CONFIG_LITMUS_NESTED_LOCKING | 244 | #ifndef CONFIG_LITMUS_NESTED_LOCKING |
245 | #define holds_locks(tsk) \ | 245 | #define holds_locks(t) \ |
246 | (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held) | 246 | (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held) |
247 | #else | 247 | #else |
248 | #define holds_locks(tsk) \ | 248 | #define holds_locks(t) \ |
249 | (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held || !binheap_empty(&tsk_rt(t)->hp_blocked_tasks)) | 249 | (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held || !binheap_empty(&tsk_rt(t)->hp_blocked_tasks)) |
250 | #endif | 250 | #endif |
251 | 251 | ||
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h index 3f3aa240778f..a1cfdb6b6416 100644 --- a/include/litmus/rt_param.h +++ b/include/litmus/rt_param.h | |||
@@ -406,6 +406,7 @@ struct rt_param { | |||
406 | 406 | ||
407 | /* pointer to lock upon which is currently blocked */ | 407 | /* pointer to lock upon which is currently blocked */ |
408 | struct litmus_lock* blocked_lock; | 408 | struct litmus_lock* blocked_lock; |
409 | struct litmus_lock* outermost_lock; | ||
409 | #endif | 410 | #endif |
410 | 411 | ||
411 | /* user controlled parameters */ | 412 | /* user controlled parameters */ |