The CLOCK_DISPATCH() macro is a horrible magic. We call common
functions if a function pointer is not set. That's just backwards.
To support dynamic file decriptor based clocks we need to cleanup that
dispatch logic.
Create a k_clock struct clock_posix_cpu which has all the
posix-cpu-timer functions filled in. After the cleanup the functions
can be made static.
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Richard Cochran <[email protected]>
---
include/linux/posix-timers.h | 2 ++
kernel/posix-cpu-timers.c | 12 ++++++++++++
2 files changed, 14 insertions(+)
Index: linux-2.6-tip/include/linux/posix-timers.h
===================================================================
--- linux-2.6-tip.orig/include/linux/posix-timers.h
+++ linux-2.6-tip/include/linux/posix-timers.h
@@ -85,6 +85,8 @@ struct k_clock {
struct itimerspec * cur_setting);
};
+extern struct k_clock clock_posix_cpu;
+
void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
/* error handlers for timer_create, nanosleep and settime */
Index: linux-2.6-tip/kernel/posix-cpu-timers.c
===================================================================
--- linux-2.6-tip.orig/kernel/posix-cpu-timers.c
+++ linux-2.6-tip/kernel/posix-cpu-timers.c
@@ -1604,6 +1604,18 @@ static long thread_cpu_nsleep_restart(st
return -EINVAL;
}
+struct k_clock clock_posix_cpu = {
+ .clock_getres = posix_cpu_clock_getres,
+ .clock_set = posix_cpu_clock_set,
+ .clock_get = posix_cpu_clock_get,
+ .timer_create = posix_cpu_timer_create,
+ .nsleep = posix_cpu_nsleep,
+ .nsleep_restart = posix_cpu_nsleep_restart,
+ .timer_set = posix_cpu_timer_set,
+ .timer_del = posix_cpu_timer_del,
+ .timer_get = posix_cpu_timer_get,
+};
+
static __init int init_posix_cpu_timers(void)
{
struct k_clock process = {
On Tue, 2011-02-01 at 13:51 +0000, Thomas Gleixner wrote:
> plain text document attachment
> (posix-timers-introduce-local-posix-cpu-clockid.patch)
> The CLOCK_DISPATCH() macro is a horrible magic. We call common
> functions if a function pointer is not set. That's just backwards.
>
> To support dynamic file decriptor based clocks we need to cleanup that
> dispatch logic.
>
> Create a k_clock struct clock_posix_cpu which has all the
> posix-cpu-timer functions filled in. After the cleanup the functions
> can be made static.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: John Stultz <[email protected]>
> Cc: Richard Cochran <[email protected]>
Acked-by: John Stultz <[email protected]>
> ---
> include/linux/posix-timers.h | 2 ++
> kernel/posix-cpu-timers.c | 12 ++++++++++++
> 2 files changed, 14 insertions(+)
>
> Index: linux-2.6-tip/include/linux/posix-timers.h
> ===================================================================
> --- linux-2.6-tip.orig/include/linux/posix-timers.h
> +++ linux-2.6-tip/include/linux/posix-timers.h
> @@ -85,6 +85,8 @@ struct k_clock {
> struct itimerspec * cur_setting);
> };
>
> +extern struct k_clock clock_posix_cpu;
> +
> void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
>
> /* error handlers for timer_create, nanosleep and settime */
> Index: linux-2.6-tip/kernel/posix-cpu-timers.c
> ===================================================================
> --- linux-2.6-tip.orig/kernel/posix-cpu-timers.c
> +++ linux-2.6-tip/kernel/posix-cpu-timers.c
> @@ -1604,6 +1604,18 @@ static long thread_cpu_nsleep_restart(st
> return -EINVAL;
> }
>
> +struct k_clock clock_posix_cpu = {
> + .clock_getres = posix_cpu_clock_getres,
> + .clock_set = posix_cpu_clock_set,
> + .clock_get = posix_cpu_clock_get,
> + .timer_create = posix_cpu_timer_create,
> + .nsleep = posix_cpu_nsleep,
> + .nsleep_restart = posix_cpu_nsleep_restart,
> + .timer_set = posix_cpu_timer_set,
> + .timer_del = posix_cpu_timer_del,
> + .timer_get = posix_cpu_timer_get,
> +};
> +
> static __init int init_posix_cpu_timers(void)
> {
> struct k_clock process = {
>
>
Commit-ID: 1976945eeaab5fa461735a6225a82c3cf1e65d62
Gitweb: http://git.kernel.org/tip/1976945eeaab5fa461735a6225a82c3cf1e65d62
Author: Thomas Gleixner <[email protected]>
AuthorDate: Tue, 1 Feb 2011 13:51:06 +0000
Committer: Thomas Gleixner <[email protected]>
CommitDate: Wed, 2 Feb 2011 15:28:12 +0100
posix-timers: Introduce clock_posix_cpu
The CLOCK_DISPATCH() macro is a horrible magic. We call common
functions if a function pointer is not set. That's just backwards.
To support dynamic file decriptor based clocks we need to cleanup that
dispatch logic.
Create a k_clock struct clock_posix_cpu which has all the
posix-cpu-timer functions filled in. After the cleanup the functions
can be made static.
Signed-off-by: Thomas Gleixner <[email protected]>
Acked-by: John Stultz <[email protected]>
Tested-by: Richard Cochran <[email protected]>
LKML-Reference: <[email protected]>
---
include/linux/posix-timers.h | 2 ++
kernel/posix-cpu-timers.c | 12 ++++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index b2c14cb..1330ff3 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -85,6 +85,8 @@ struct k_clock {
struct itimerspec * cur_setting);
};
+extern struct k_clock clock_posix_cpu;
+
void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
/* error handlers for timer_create, nanosleep and settime */
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 11b91dc..816cd49 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1604,6 +1604,18 @@ static long thread_cpu_nsleep_restart(struct restart_block *restart_block)
return -EINVAL;
}
+struct k_clock clock_posix_cpu = {
+ .clock_getres = posix_cpu_clock_getres,
+ .clock_set = posix_cpu_clock_set,
+ .clock_get = posix_cpu_clock_get,
+ .timer_create = posix_cpu_timer_create,
+ .nsleep = posix_cpu_nsleep,
+ .nsleep_restart = posix_cpu_nsleep_restart,
+ .timer_set = posix_cpu_timer_set,
+ .timer_del = posix_cpu_timer_del,
+ .timer_get = posix_cpu_timer_get,
+};
+
static __init int init_posix_cpu_timers(void)
{
struct k_clock process = {