[PATCH 06/16] sched/wait: Collapse __wait_event_timeout()

From: Peter Zijlstra
Date: Wed Oct 02 2013 - 05:54:18 EST


Reduce macro complexity by using the new ___wait_event() helper.
No change in behaviour, identical generated code.

Reviewed-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
---
include/linux/tty.h | 21 +----
include/linux/wait.h | 192 +++++++++++++++------------------------------------
2 files changed, 63 insertions(+), 150 deletions(-)

--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -220,17 +247,9 @@ do { \
} while (0)

#define __wait_event_timeout(wq, condition, ret) \
-do { \
- DEFINE_WAIT(__wait); \
- \
- for (;;) { \
- prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \
- if (___wait_cond_timeout(condition, ret)) \
- break; \
- ret = schedule_timeout(ret); \
- } \
- finish_wait(&wq, &__wait); \
-} while (0)
+ ___wait_event(wq, ___wait_cond_timeout(condition, ret), \
+ TASK_UNINTERRUPTIBLE, 0, ret, \
+ ret = schedule_timeout(ret))

/**
* wait_event_timeout - sleep until a condition gets true or a timeout elapses


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/