Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 838394fb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Convert timer_create() to clockid_to_kclock() 



Setup timer_create for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks and
remove the no_timer_create() implementation.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.903604289@linutronix.de>
parent ebaac757

kernel/posix-timers.c

+15 −25
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static struct k_clock posix_clocks[MAX_CLOCKS]; 
 */

static int common_nsleep(const clockid_t, int flags, struct timespec *t,

			 struct timespec __user *rmtp);

static int common_timer_create(struct k_itimer *new_timer);

static void common_timer_get(struct k_itimer *, struct itimerspec *);

static int common_timer_set(struct k_itimer *, int,

			    struct itimerspec *, struct itimerspec *);
@@ -174,25 +175,6 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) 
 	 (posix_clocks[clock].call != NULL \

 	  ? (*posix_clocks[clock].call) arglist : common_##call arglist))



/*

 * Default clock hook functions when the struct k_clock passed

 * to register_posix_clock leaves a function pointer null.

 *

 * The function common_CALL is the default implementation for

 * the function pointer CALL in struct k_clock.

 */



static int common_timer_create(struct k_itimer *new_timer)

{

	hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0);

	return 0;

}



static int no_timer_create(struct k_itimer *new_timer)

{

	return -EOPNOTSUPP;

}



/*

 * Return nonzero if we know a priori this clockid_t value is bogus.

 */
@@ -269,27 +251,26 @@ static __init int init_posix_timers(void) 
		.clock_set	= posix_clock_realtime_set,

		.nsleep		= common_nsleep,

		.nsleep_restart	= hrtimer_nanosleep_restart,

		.timer_create	= common_timer_create,

	};

	struct k_clock clock_monotonic = {

		.clock_getres	= hrtimer_get_res,

		.clock_get	= posix_ktime_get_ts,

		.nsleep		= common_nsleep,

		.nsleep_restart	= hrtimer_nanosleep_restart,

		.timer_create	= common_timer_create,

	};

	struct k_clock clock_monotonic_raw = {

		.clock_getres	= hrtimer_get_res,

		.clock_get	= posix_get_monotonic_raw,

		.timer_create	= no_timer_create,

	};

	struct k_clock clock_realtime_coarse = {

		.clock_getres	= posix_get_coarse_res,

		.clock_get	= posix_get_realtime_coarse,

		.timer_create	= no_timer_create,

	};

	struct k_clock clock_monotonic_coarse = {

		.clock_getres	= posix_get_coarse_res,

		.clock_get	= posix_get_monotonic_coarse,

		.timer_create	= no_timer_create,

	};



	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
@@ -534,19 +515,28 @@ static struct k_clock *clockid_to_kclock(const clockid_t id) 
	return &posix_clocks[id];

}



static int common_timer_create(struct k_itimer *new_timer)

{

	hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0);

	return 0;

}



/* Create a POSIX.1b interval timer. */



SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,

		struct sigevent __user *, timer_event_spec,

		timer_t __user *, created_timer_id)

{

	struct k_clock *kc = clockid_to_kclock(which_clock);

	struct k_itimer *new_timer;

	int error, new_timer_id;

	sigevent_t event;

	int it_id_set = IT_ID_NOT_SET;



	if (invalid_clockid(which_clock))

	if (!kc)

		return -EINVAL;

	if (!kc->timer_create)

		return -EOPNOTSUPP;



	new_timer = alloc_posix_timer();

	if (unlikely(!new_timer))
@@ -608,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, 
		goto out;

	}



	error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer));

	error = kc->timer_create(new_timer);

	if (error)

		goto out;