Use the more SMP-friendly prepare_to_wait()/finish_wait() in wait_event() and
friends.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/include/linux/wait.h | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff -puN include/linux/wait.h~fancy-wakeups-in-wait-h include/linux/wait.h
--- 25/include/linux/wait.h~fancy-wakeups-in-wait-h 2004-06-19 02:24:13.509006392 -0700
+++ 25-akpm/include/linux/wait.h 2004-06-19 02:32:20.293003976 -0700
@@ -120,18 +120,15 @@ extern void FASTCALL(__wake_up_sync(wait
#define __wait_event(wq, condition) \
do { \
- wait_queue_t __wait; \
- init_waitqueue_entry(&__wait, current); \
+ DEFINE_WAIT(__wait); \
\
- add_wait_queue(&wq, &__wait); \
for (;;) { \
- set_current_state(TASK_UNINTERRUPTIBLE); \
+ prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \
if (condition) \
break; \
schedule(); \
} \
- current->state = TASK_RUNNING; \
- remove_wait_queue(&wq, &__wait); \
+ finish_wait(&wq, &__wait); \
} while (0)
#define wait_event(wq, condition) \
@@ -143,12 +140,10 @@ do { \
#define __wait_event_interruptible(wq, condition, ret) \
do { \
- wait_queue_t __wait; \
- init_waitqueue_entry(&__wait, current); \
+ DEFINE_WAIT(__wait); \
\
- add_wait_queue(&wq, &__wait); \
for (;;) { \
- set_current_state(TASK_INTERRUPTIBLE); \
+ prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
@@ -158,8 +153,7 @@ do { \
ret = -ERESTARTSYS; \
break; \
} \
- current->state = TASK_RUNNING; \
- remove_wait_queue(&wq, &__wait); \
+ finish_wait(&wq, &__wait); \
} while (0)
#define wait_event_interruptible(wq, condition) \
@@ -172,12 +166,10 @@ do { \
#define __wait_event_interruptible_timeout(wq, condition, ret) \
do { \
- wait_queue_t __wait; \
- init_waitqueue_entry(&__wait, current); \
+ DEFINE_WAIT(__wait); \
\
- add_wait_queue(&wq, &__wait); \
for (;;) { \
- set_current_state(TASK_INTERRUPTIBLE); \
+ prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
@@ -189,8 +181,7 @@ do { \
ret = -ERESTARTSYS; \
break; \
} \
- current->state = TASK_RUNNING; \
- remove_wait_queue(&wq, &__wait); \
+ finish_wait(&wq, &__wait); \
} while (0)
#define wait_event_interruptible_timeout(wq, condition, timeout) \
@@ -203,12 +194,11 @@ do { \
#define __wait_event_interruptible_exclusive(wq, condition, ret) \
do { \
- wait_queue_t __wait; \
- init_waitqueue_entry(&__wait, current); \
+ DEFINE_WAIT(__wait); \
\
- add_wait_queue_exclusive(&wq, &__wait); \
for (;;) { \
- set_current_state(TASK_INTERRUPTIBLE); \
+ prepare_to_wait_exclusive(&wq, &__wait, \
+ TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
@@ -218,8 +208,7 @@ do { \
ret = -ERESTARTSYS; \
break; \
} \
- current->state = TASK_RUNNING; \
- remove_wait_queue(&wq, &__wait); \
+ finish_wait(&wq, &__wait); \
} while (0)
#define wait_event_interruptible_exclusive(wq, condition) \
_