lkml.org 
[lkml]   [2012]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 4/6 option-B] kmod: add new wait_for_completion_timeout_state() helper

This patch is if the more desirable patch is not accepted:

completion: Add new wait_for_completion_timeout_state

There are sometime places where an API hides a completion
inside it's implementation, and needs to expose the kind of
wait it does to it's upper users. Instead of such cases that
now need an ugly switch case to call the different
wait_for_completion_xxx function define a generic one
which can do all.

A new user will be added to this API in linux/kmod.h.

The return value from this member is a more Linux Kernel natural.
It will return:
0 - If the wait was actually completed by a complete() signal.
-ERESTARTSYS - If interrupted
-ETIMEDOUT - If timeout expired

It can be seen that done here is more complicated/ugly then if
done at kernel/sched/core.c

Note that at this stage there is a warning:
kernel/kmod.c:473:1: warning: 'wait_for_completion_timeout_state' defined but not used [-Wunused-function]

Until the next patch. I keep it separate for the different options
to be taken

CC: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
kernel/kmod.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 309299a..b404f99 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -466,6 +466,46 @@ void call_usermodehelper_setfns(struct subprocess_info *info,
info->data = data;
}

+/* Used by call_usermodehelper_exec below should be considered for
+ * kernel/sched/core.c
+ */
+static int
+wait_for_completion_timeout_state(struct completion *x,
+ unsigned long timeout, int state)
+{
+ long t;
+ int ret;
+
+ if (!timeout)
+ timeout = MAX_SCHEDULE_TIMEOUT;
+
+ switch (state) {
+ default:
+ WARN_ON_ONCE(1);
+ /* fall through */
+ case 0:
+ wait_for_completion(x);
+ t = 1;
+ break;
+ case TASK_KILLABLE:
+ t = wait_for_completion_killable_timeout(x, timeout);
+ break;
+ case TASK_INTERRUPTIBLE:
+ t = wait_for_completion_interruptible_timeout(x, timeout);
+ break;
+ }
+
+ if (likely(t > 0)) {
+ ret = 0;
+ } else {
+ if (t < 0)
+ ret = t;
+ else
+ ret = -ETIMEDOUT;
+ }
+ return ret;
+}
+
/**
* call_usermodehelper_exec - start a usermode application
* @sub_info: information about the subprocessa
--
1.7.6.5



\
 
 \ /
  Last update: 2012-03-27 04:13    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site