epoll keyed wakeups v3 - introduce new *_poll() wakeup macros
PATCH 2/6 epoll keyed wakeups v3 - introduce new *_poll() wakeup macros
This patch introduces new wakeup macros that allow passing an event mask to the wakeup targets. They exactly mimic their non-_poll() counterpart, with the added event mask passing capability. I did add only the ones currently requested, avoiding the _nr() and _all() for the moment.
Signed-off-by Davide Libenzi <[email protected]>
- Davide
--- include/linux/wait.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
include/linux/wait.h +9 -13
@@ -156,21 +156,17 @@ wait_queue_head_t *bit_waitqueue(void *,#define wake_up_interruptible_all (x) __wake_up(x, TASK_INTERRUPTIBLE, 0, NULL)#define wake_up_interruptible_sync (x) __wake_up_sync((x), TASK_INTERRUPTIBLE, 1) -#ifdef CONFIG_DEBUG_LOCK_ALLOC /* -* macro to avoid include hell +* Wakeup macros to be used to report events to the targets. */ -#define wake_up_nested (x, s) \ -do { \ - unsigned long flags; \ - \ - spin_lock_irqsave_nested(&(x)->lock, flags, (s)); \ - wake_up_locked(x); \ - spin_unlock_irqrestore(&(x)->lock, flags); \ -} while (0) -#else -#define wake_up_nested (x, s) wake_up(x) -#endif +#define wake_up_poll (x, m) \ + __wake_up(x, TASK_NORMAL, 1, (void *) (m)) +#define wake_up_locked_poll (x, m) \ + __wake_up_locked_key((x), TASK_NORMAL, (void *) (m)) +#define wake_up_interruptible_poll (x, m) \ + __wake_up(x, TASK_INTERRUPTIBLE, 1, (void *) (m)) +#define wake_up_interruptible_sync_poll (x, m) \ + __wake_up_sync_key((x), TASK_INTERRUPTIBLE, 1, (void *) (m))#define __wait_event (wq, condition) \ do { \