Re: [PATCH 2/7] wait: Reimplement wait_event_freezable()

From: Peter Zijlstra
Date: Fri Oct 31 2014 - 13:41:37 EST


On Fri, Oct 31, 2014 at 12:10:39PM +0100, Peter Zijlstra wrote:
> Provide better implementations of wait_event_freezable() APIs.
>
> The problem is with freezer_do_not_count(), it hides the thread from
> the freezer, even though this thread might not actually freeze/sleep
> at all.
>
> Cc: oleg@xxxxxxxxxx
> Cc: Rafael Wysocki <rjw@xxxxxxxxxxxxx>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
> ---

This would maybe compile better.. gotta run, will test later.

--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -284,12 +284,13 @@ do { \
* change the result of the wait condition.
*/
#define wait_event_freezable(wq, condition) \
-do { \
+({ \
+ int __ret = 0; \
might_sleep(); \
- if (condition) \
- break; \
- __wait_event_freezable(wq, condition); \
-} while (0)
+ if (!(condition)) \
+ __ret = __wait_event_freezable(wq, condition); \
+ __ret; \
+})

#define __wait_event_timeout(wq, condition, timeout) \
___wait_event(wq, ___wait_cond_timeout(condition), \
--
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/