From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757603AbYDTXH4 (ORCPT ); Sun, 20 Apr 2008 19:07:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753504AbYDTXHs (ORCPT ); Sun, 20 Apr 2008 19:07:48 -0400 Received: from ozlabs.org ([203.10.76.45]:44351 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753502AbYDTXHr (ORCPT ); Sun, 20 Apr 2008 19:07:47 -0400 From: Rusty Russell To: linux-kernel@vger.kernel.org Subject: [PATCH 4/6] typesafe: kthread_create and kthread_run Date: Mon, 21 Apr 2008 09:07:44 +1000 User-Agent: KMail/1.9.9 Cc: Andrew Morton , Al Viro , Linus Torvalds References: <200804210859.00080.rusty@rustcorp.com.au> <200804210901.20229.rusty@rustcorp.com.au> <200804210905.33090.rusty@rustcorp.com.au> In-Reply-To: <200804210905.33090.rusty@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200804210907.44606.rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Straight-forward conversion to allow typesafe callbacks. Needs the previously-posted __attribute__((format)) one-liner patch. Signed-off-by: Rusty Russell --- include/linux/kthread.h | 28 +++++++++++++++++++++++++--- kernel/kthread.c | 29 +++++------------------------ 2 files changed, 30 insertions(+), 27 deletions(-) diff -r f5a7f7f9683c include/linux/kthread.h --- a/include/linux/kthread.h Mon Apr 07 18:36:20 2008 +1000 +++ b/include/linux/kthread.h Mon Apr 07 19:12:04 2008 +1000 @@ -4,9 +4,31 @@ #include #include -struct task_struct *kthread_create(int (*threadfn)(void *data), - void *data, - const char namefmt[], ...) +/** + * kthread_create - create a kthread. + * @threadfn: the function to run until signal_pending(current). + * @data: data ptr for @threadfn. + * @namefmt: printf-style name for the thread. + * + * Description: This helper function creates and names a kernel + * thread. The thread will be stopped: use wake_up_process() to start + * it. See also kthread_run(), kthread_create_on_cpu(). + * + * When woken, the thread will run @threadfn() with @data as its + * argument. @threadfn() can either call do_exit() directly if it is a + * standalone thread for which noone will call kthread_stop(), or + * return when 'kthread_should_stop()' is true (which means + * kthread_stop() has been called). The return value should be zero + * or a negative error number; it will be passed to kthread_stop(). + * + * Returns a task_struct or ERR_PTR(-ENOMEM). + */ +#define kthread_create(threadfn, data, namefmt...) \ + __kthread_create(typesafe_cb(int,(threadfn),(data)), (data), namefmt) + +struct task_struct *__kthread_create(int (*threadfn)(void *data), + void *data, + const char namefmt[], ...) __attribute__((format(printf, 3, 4))); /** diff -r f5a7f7f9683c kernel/kthread.c --- a/kernel/kthread.c Mon Apr 07 18:36:20 2008 +1000 +++ b/kernel/kthread.c Mon Apr 07 19:12:04 2008 +1000 @@ -112,29 +112,10 @@ static void create_kthread(struct kthrea complete(&create->done); } -/** - * kthread_create - create a kthread. - * @threadfn: the function to run until signal_pending(current). - * @data: data ptr for @threadfn. - * @namefmt: printf-style name for the thread. - * - * Description: This helper function creates and names a kernel - * thread. The thread will be stopped: use wake_up_process() to start - * it. See also kthread_run(), kthread_create_on_cpu(). - * - * When woken, the thread will run @threadfn() with @data as its - * argument. @threadfn() can either call do_exit() directly if it is a - * standalone thread for which noone will call kthread_stop(), or - * return when 'kthread_should_stop()' is true (which means - * kthread_stop() has been called). The return value should be zero - * or a negative error number; it will be passed to kthread_stop(). - * - * Returns a task_struct or ERR_PTR(-ENOMEM). - */ -struct task_struct *kthread_create(int (*threadfn)(void *data), - void *data, - const char namefmt[], - ...) +struct task_struct *__kthread_create(int (*threadfn)(void *data), + void *data, + const char namefmt[], + ...) { struct kthread_create_info create; @@ -159,7 +140,7 @@ struct task_struct *kthread_create(int ( } return create.result; } -EXPORT_SYMBOL(kthread_create); +EXPORT_SYMBOL(__kthread_create); /** * kthread_bind - bind a just-created kthread to a cpu.