lkml.org 
[lkml]   [2020]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: timers/core] posix-clocks: Rename .clock_get_timespec() callbacks accordingly
    The following commit has been merged into the timers/core branch of tip:

    Commit-ID: eaf80194d0fe48be393587541c48a799a9a06a70
    Gitweb: https://git.kernel.org/tip/eaf80194d0fe48be393587541c48a799a9a06a70
    Author: Andrei Vagin <avagin@gmail.com>
    AuthorDate: Tue, 12 Nov 2019 01:26:55
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Tue, 14 Jan 2020 12:20:50 +01:00

    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: Thomas Gleixner <tglx@linutronix.de>
    Co-developed-by: Dmitry Safonov <dima@arista.com>
    Signed-off-by: Andrei Vagin <avagin@gmail.com>
    Signed-off-by: Dmitry Safonov <dima@arista.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lore.kernel.org/r/20191112012724.250792-7-dima@arista.com


    ---
    kernel/time/alarmtimer.c | 6 +++---
    kernel/time/posix-timers.c | 16 ++++++++--------
    2 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
    index 8523df7..62b06cf 100644
    --- a/kernel/time/alarmtimer.c
    +++ b/kernel/time/alarmtimer.c
    @@ -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,
    diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
    index 44d4f9c..68d4690 100644
    --- a/kernel/time/posix-timers.c
    +++ b/kernel/time/posix-timers.c
    @@ -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,
    \
     
     \ /
      Last update: 2020-01-14 14:04    [W:4.174 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site