Commit becf8b5d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

[PATCH] hrtimer: convert posix timers completely

- convert posix-timers.c to use hrtimers

- remove the now obsolete abslist code
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 97735f25
...@@ -99,7 +99,8 @@ void uml_idle_timer(void) ...@@ -99,7 +99,8 @@ void uml_idle_timer(void)
set_interval(ITIMER_REAL); set_interval(ITIMER_REAL);
} }
extern int do_posix_clock_monotonic_gettime(struct timespec *tp); extern void ktime_get_ts(struct timespec *ts);
#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
void time_init(void) void time_init(void)
{ {
...@@ -114,8 +115,8 @@ void time_init(void) ...@@ -114,8 +115,8 @@ void time_init(void)
wall_to_monotonic.tv_nsec = -now.tv_nsec; wall_to_monotonic.tv_nsec = -now.tv_nsec;
} }
/* Declared in linux/time.h, which can't be included here */ /* Defined in linux/ktimer.h, which can't be included here */
extern void clock_was_set(void); #define clock_was_set() do { } while (0)
void do_gettimeofday(struct timeval *tv) void do_gettimeofday(struct timeval *tv)
{ {
......
...@@ -93,6 +93,13 @@ struct hrtimer_base { ...@@ -93,6 +93,13 @@ struct hrtimer_base {
struct hrtimer *curr_timer; struct hrtimer *curr_timer;
}; };
/*
* clock_was_set() is a NOP for non- high-resolution systems. The
* time-sorted order guarantees that a timer does not expire early and
* is expired in the next softirq when the clock was advanced.
*/
#define clock_was_set() do { } while (0)
/* Exported timer functions: */ /* Exported timer functions: */
/* Initialize timers: */ /* Initialize timers: */
......
...@@ -51,12 +51,8 @@ struct k_itimer { ...@@ -51,12 +51,8 @@ struct k_itimer {
struct sigqueue *sigq; /* signal queue entry. */ struct sigqueue *sigq; /* signal queue entry. */
union { union {
struct { struct {
struct timer_list timer; struct hrtimer timer;
/* clock abs_timer_list: */ ktime_t interval;
struct list_head abs_timer_entry;
/* wall_to_monotonic used when set: */
struct timespec wall_to_prev;
unsigned long incr; /* interval in jiffies */
} real; } real;
struct cpu_timer_list cpu; struct cpu_timer_list cpu;
struct { struct {
...@@ -68,15 +64,9 @@ struct k_itimer { ...@@ -68,15 +64,9 @@ struct k_itimer {
} it; } it;
}; };
struct k_clock_abs {
struct list_head list;
spinlock_t lock;
};
struct k_clock { struct k_clock {
int res; /* in nanoseconds */ int res; /* in nanoseconds */
int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
struct k_clock_abs *abs_struct;
int (*clock_set) (const clockid_t which_clock, struct timespec * tp); int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
int (*clock_get) (const clockid_t which_clock, struct timespec * tp); int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
int (*timer_create) (struct k_itimer *timer); int (*timer_create) (struct k_itimer *timer);
...@@ -102,29 +92,6 @@ int do_posix_clock_nosettime(const clockid_t, struct timespec *tp); ...@@ -102,29 +92,6 @@ int do_posix_clock_nosettime(const clockid_t, struct timespec *tp);
/* function to call to trigger timer event */ /* function to call to trigger timer event */
int posix_timer_event(struct k_itimer *timr, int si_private); int posix_timer_event(struct k_itimer *timr, int si_private);
struct now_struct {
unsigned long jiffies;
};
#define posix_get_now(now) \
do { (now)->jiffies = jiffies; } while (0)
#define posix_time_before(timer, now) \
time_before((timer)->expires, (now)->jiffies)
#define posix_bump_timer(timr, now) \
do { \
long delta, orun; \
\
delta = (now).jiffies - (timr)->it.real.timer.expires; \
if (delta >= 0) { \
orun = 1 + (delta / (timr)->it.real.incr); \
(timr)->it.real.timer.expires += \
orun * (timr)->it.real.incr; \
(timr)->it_overrun += orun; \
} \
} while (0)
int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *ts); int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *ts);
int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts); int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts);
int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts); int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts);
......
...@@ -73,8 +73,7 @@ struct timespec current_kernel_time(void); ...@@ -73,8 +73,7 @@ struct timespec current_kernel_time(void);
extern void do_gettimeofday(struct timeval *tv); extern void do_gettimeofday(struct timeval *tv);
extern int do_settimeofday(struct timespec *tv); extern int do_settimeofday(struct timespec *tv);
extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz);
extern void clock_was_set(void); // call whenever the clock is set #define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
extern int do_posix_clock_monotonic_gettime(struct timespec *tp);
extern long do_utimes(char __user *filename, struct timeval *times); extern long do_utimes(char __user *filename, struct timeval *times);
struct itimerval; struct itimerval;
extern int do_setitimer(int which, struct itimerval *value, extern int do_setitimer(int which, struct itimerval *value,
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment