[PATCH] hrtimer: convert posix timers completely
- convert posix-timers.c to use hrtimers - remove the now obsolete abslist code Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
97735f25d2
commit
becf8b5d00
@@ -93,6 +93,13 @@ struct hrtimer_base {
|
||||
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: */
|
||||
|
||||
/* Initialize timers: */
|
||||
|
@@ -51,12 +51,8 @@ struct k_itimer {
|
||||
struct sigqueue *sigq; /* signal queue entry. */
|
||||
union {
|
||||
struct {
|
||||
struct timer_list timer;
|
||||
/* clock abs_timer_list: */
|
||||
struct list_head abs_timer_entry;
|
||||
/* wall_to_monotonic used when set: */
|
||||
struct timespec wall_to_prev;
|
||||
unsigned long incr; /* interval in jiffies */
|
||||
struct hrtimer timer;
|
||||
ktime_t interval;
|
||||
} real;
|
||||
struct cpu_timer_list cpu;
|
||||
struct {
|
||||
@@ -68,15 +64,9 @@ struct k_itimer {
|
||||
} it;
|
||||
};
|
||||
|
||||
struct k_clock_abs {
|
||||
struct list_head list;
|
||||
spinlock_t lock;
|
||||
};
|
||||
|
||||
struct k_clock {
|
||||
int res; /* in nanoseconds */
|
||||
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_get) (const clockid_t which_clock, struct timespec * tp);
|
||||
int (*timer_create) (struct k_itimer *timer);
|
||||
@@ -102,29 +92,6 @@ int do_posix_clock_nosettime(const clockid_t, struct timespec *tp);
|
||||
/* function to call to trigger timer event */
|
||||
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_get(const clockid_t which_clock, 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);
|
||||
extern void do_gettimeofday(struct timeval *tv);
|
||||
extern int do_settimeofday(struct timespec *tv);
|
||||
extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz);
|
||||
extern void clock_was_set(void); // call whenever the clock is set
|
||||
extern int do_posix_clock_monotonic_gettime(struct timespec *tp);
|
||||
#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
|
||||
extern long do_utimes(char __user *filename, struct timeval *times);
|
||||
struct itimerval;
|
||||
extern int do_setitimer(int which, struct itimerval *value,
|
||||
|
Reference in New Issue
Block a user