Commit eaf80194 authored by Andrei Vagin's avatar Andrei Vagin Committed by Thomas Gleixner
Browse files

posix-clocks: Rename .clock_get_timespec() callbacks accordingly 



The upcoming support for time namespaces requires to have access to:

  - The time in a task's time namespace for sys_clock_gettime()
  - The time in the root name space for common_timer_get()

That adds a valid reason to finally implement a separate callback which
returns the time in ktime_t format in (struct k_clock).

As a preparation ground for introducing clock_get_ktime(), the original
callback clock_get() was renamed into clock_get_timespec().
Reflect the renaming into the callback implementations.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Co-developed-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarAndrei Vagin <avagin@gmail.com>
Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20191112012724.250792-7-dima@arista.com
parent 819a95fe

kernel/time/alarmtimer.c

+3 −3
Original line number Diff line number Diff line
@@ -657,13 +657,13 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec64 *tp 
}



/**

 * alarm_clock_get - posix clock_get_timespec interface

 * alarm_clock_get_timespec - posix clock_get_timespec interface

 * @which_clock: clockid

 * @tp: timespec to fill.

 *

 * Provides the underlying alarm base time.

 */

static int alarm_clock_get(clockid_t which_clock, struct timespec64 *tp)

static int alarm_clock_get_timespec(clockid_t which_clock, struct timespec64 *tp)

{

	struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)];
@@ -837,7 +837,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, 


const struct k_clock alarm_clock = {

	.clock_getres		= alarm_clock_getres,

	.clock_get_timespec	= alarm_clock_get,

	.clock_get_timespec	= alarm_clock_get_timespec,

	.timer_create		= alarm_timer_create,

	.timer_set		= common_timer_set,

	.timer_del		= common_timer_del,

kernel/time/posix-timers.c

+8 −8
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) 
}



/* Get clock_realtime */

static int posix_clock_realtime_get(clockid_t which_clock, struct timespec64 *tp)

static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64 *tp)

{

	ktime_get_real_ts64(tp);

	return 0;
@@ -187,7 +187,7 @@ static int posix_clock_realtime_adj(const clockid_t which_clock, 
/*

 * Get monotonic time for posix timers

 */

static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp)

static int posix_get_monotonic_timespec(clockid_t which_clock, struct timespec64 *tp)

{

	ktime_get_ts64(tp);

	return 0;
@@ -222,13 +222,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 * 
	return 0;

}



static int posix_get_boottime(const clockid_t which_clock, struct timespec64 *tp)

static int posix_get_boottime_timespec(const clockid_t which_clock, struct timespec64 *tp)

{

	ktime_get_boottime_ts64(tp);

	return 0;

}



static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp)

static int posix_get_tai_timespec(clockid_t which_clock, struct timespec64 *tp)

{

	ktime_get_clocktai_ts64(tp);

	return 0;
@@ -1261,7 +1261,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, 


static const struct k_clock clock_realtime = {

	.clock_getres		= posix_get_hrtimer_res,

	.clock_get_timespec	= posix_clock_realtime_get,

	.clock_get_timespec	= posix_get_realtime_timespec,

	.clock_set		= posix_clock_realtime_set,

	.clock_adj		= posix_clock_realtime_adj,

	.nsleep			= common_nsleep,
@@ -1279,7 +1279,7 @@ static const struct k_clock clock_realtime = { 


static const struct k_clock clock_monotonic = {

	.clock_getres		= posix_get_hrtimer_res,

	.clock_get_timespec	= posix_ktime_get_ts,

	.clock_get_timespec	= posix_get_monotonic_timespec,

	.nsleep			= common_nsleep,

	.timer_create		= common_timer_create,

	.timer_set		= common_timer_set,
@@ -1310,7 +1310,7 @@ static const struct k_clock clock_monotonic_coarse = { 


static const struct k_clock clock_tai = {

	.clock_getres		= posix_get_hrtimer_res,

	.clock_get_timespec	= posix_get_tai,

	.clock_get_timespec	= posix_get_tai_timespec,

	.nsleep			= common_nsleep,

	.timer_create		= common_timer_create,

	.timer_set		= common_timer_set,
@@ -1326,7 +1326,7 @@ static const struct k_clock clock_tai = { 


static const struct k_clock clock_boottime = {

	.clock_getres		= posix_get_hrtimer_res,

	.clock_get_timespec	= posix_get_boottime,

	.clock_get_timespec	= posix_get_boottime_timespec,

	.nsleep			= common_nsleep,

	.timer_create		= common_timer_create,

	.timer_set		= common_timer_set,

CRA Git | Maintained and supported by SUSTech CRA and CCSE