X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-time.h;h=454f37eec7c287db2a4b0d4a7dc5d0b115bc38e6;hp=7d6333850426b5a47faf2fcae8398aac2595d854;hb=faeeda3a69689f48605561f9e86e5a59b7d6b1fc;hpb=9f8e9741e1cc770c766cf714f8327254c0d5fed0 diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h index 7d63338..454f37e 100644 --- a/libcfs/include/libcfs/linux/linux-time.h +++ b/libcfs/include/libcfs/linux/linux-time.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -17,17 +15,15 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,278 +39,213 @@ #ifndef __LIBCFS_LINUX_LINUX_TIME_H__ #define __LIBCFS_LINUX_LINUX_TIME_H__ -#ifndef __LIBCFS_LIBCFS_H__ -#error Do not #include this file directly. #include instead -#endif - -#ifndef __KERNEL__ -#error This include is only for kernel use. -#endif - /* Portable time API */ - -/* - * Platform provides three opaque data-types: - * - * cfs_time_t represents point in time. This is internal kernel - * time rather than "wall clock". This time bears no - * relation to gettimeofday(). - * - * cfs_duration_t represents time interval with resolution of internal - * platform clock - * - * cfs_fs_time_t represents instance in world-visible time. This is - * used in file-system time-stamps - * - * cfs_time_t cfs_time_current(void); - * cfs_time_t cfs_time_add (cfs_time_t, cfs_duration_t); - * cfs_duration_t cfs_time_sub (cfs_time_t, cfs_time_t); - * int cfs_time_before (cfs_time_t, cfs_time_t); - * int cfs_time_beforeq(cfs_time_t, cfs_time_t); - * - * cfs_duration_t cfs_duration_build(int64_t); - * - * time_t cfs_duration_sec (cfs_duration_t); - * void cfs_duration_usec(cfs_duration_t, struct timeval *); - * void cfs_duration_nsec(cfs_duration_t, struct timespec *); - * - * void cfs_fs_time_current(cfs_fs_time_t *); - * time_t cfs_fs_time_sec (cfs_fs_time_t *); - * void cfs_fs_time_usec (cfs_fs_time_t *, struct timeval *); - * void cfs_fs_time_nsec (cfs_fs_time_t *, struct timespec *); - * int cfs_fs_time_before (cfs_fs_time_t *, cfs_fs_time_t *); - * int cfs_fs_time_beforeq(cfs_fs_time_t *, cfs_fs_time_t *); - * - * CFS_TIME_FORMAT - * CFS_DURATION_FORMAT - * - */ - -#define ONE_BILLION ((u_int64_t)1000000000) -#define ONE_MILLION 1000000 - -#ifndef __KERNEL__ -#error This include is only for kernel use. -#endif - -#ifndef AUTOCONF_INCLUDED -#include -#endif +#include #include #include #include +#include +#include +#include #include #include -#include - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - /* - * old kernels---CURRENT_TIME is struct timeval + * Generic kernel stuff */ -typedef struct timeval cfs_fs_time_t; +#ifndef HAVE_TIMESPEC64 -static inline void cfs_fs_time_usec(cfs_fs_time_t *t, struct timeval *v) -{ - *v = *t; -} +typedef __s64 time64_t; + +#if __BITS_PER_LONG == 64 + +# define timespec64 timespec -static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s) +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) { - s->tv_sec = t->tv_sec; - s->tv_nsec = t->tv_usec * 1000; + return ts; } -/* - * internal helper function used by cfs_fs_time_before*() - */ -static inline unsigned long long __cfs_fs_time_flat(cfs_fs_time_t *t) +static inline struct timespec timespec64_to_timespec(const struct timespec64 ts) { - return (unsigned long long)t->tv_sec * ONE_MILLION + t->tv_usec; + return ts; } -#define CURRENT_KERN_TIME xtime - #else -/* (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) */ - -/* - * post 2.5 kernels. - */ +struct timespec64 { + time64_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; -#include - -typedef struct timespec cfs_fs_time_t; - -static inline void cfs_fs_time_usec(cfs_fs_time_t *t, struct timeval *v) +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) { - v->tv_sec = t->tv_sec; - v->tv_usec = t->tv_nsec / 1000; -} + struct timespec64 ret; -static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s) -{ - *s = *t; + ret.tv_sec = ts.tv_sec; + ret.tv_nsec = ts.tv_nsec; + return ret; } -/* - * internal helper function used by cfs_fs_time_before*() - */ -static inline unsigned long long __cfs_fs_time_flat(cfs_fs_time_t *t) +static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64) { - return (unsigned long long)t->tv_sec * ONE_BILLION + t->tv_nsec; -} + struct timespec ret; -#define CURRENT_KERN_TIME CURRENT_TIME + ret.tv_sec = (time_t)ts64.tv_sec; + ret.tv_nsec = ts64.tv_nsec; + return ret; +} +#endif /* __BITS_PER_LONG != 64 */ -/* (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) */ -#endif +#endif /* HAVE_TIMESPEC64 */ -/* - * Generic kernel stuff - */ +#ifndef HAVE_NS_TO_TIMESPEC64 +static inline struct timespec64 ns_to_timespec64(const s64 nsec) +{ + struct timespec64 ts; + s32 rem; -typedef unsigned long cfs_time_t; /* jiffies */ -typedef long cfs_duration_t; + if (!nsec) + return (struct timespec64) {0, 0}; + ts.tv_sec = div_s64_rem(nsec, NSEC_PER_SEC, &rem); + if (unlikely(rem < 0)) { + ts.tv_sec--; + rem += NSEC_PER_SEC; + } + ts.tv_nsec = rem; -static inline cfs_time_t cfs_time_current(void) -{ - return jiffies; + return ts; } +#endif -static inline time_t cfs_time_current_sec(void) -{ - return CURRENT_SECONDS; -} +#ifndef HAVE_KTIME_ADD +# define ktime_add(lhs, rhs) ({ (ktime_t){ .tv64 = (lhs).tv64 + (rhs).tv64 }; }) +#endif /* !HAVE_KTIME_ADD */ -static inline void cfs_fs_time_current(cfs_fs_time_t *t) +#ifndef HAVE_KTIME_AFTER +static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2) { - *t = CURRENT_KERN_TIME; + return cmp1.tv64 > cmp2.tv64; } +#endif /* !HAVE_KTIME_AFTER */ -static inline time_t cfs_fs_time_sec(cfs_fs_time_t *t) +#ifndef HAVE_KTIME_BEFORE +static inline bool ktime_before(const ktime_t cmp1, const ktime_t cmp2) { - return t->tv_sec; + return cmp1.tv64 < cmp2.tv64; } +#endif /* !HAVE_KTIME_BEFORE */ -static inline int cfs_fs_time_before(cfs_fs_time_t *t1, cfs_fs_time_t *t2) +#ifndef HAVE_KTIME_COMPARE +static inline int ktime_compare(const ktime_t cmp1, const ktime_t cmp2) { - return __cfs_fs_time_flat(t1) < __cfs_fs_time_flat(t2); + if (cmp1.tv64 < cmp2.tv64) + return -1; + if (cmp1.tv64 > cmp2.tv64) + return 1; + return 0; } +#endif /* !HAVE_KTIME_COMPARE */ -static inline int cfs_fs_time_beforeq(cfs_fs_time_t *t1, cfs_fs_time_t *t2) -{ - return __cfs_fs_time_flat(t1) <= __cfs_fs_time_flat(t2); -} +#ifndef HAVE_KTIME_GET_TS64 +void ktime_get_ts64(struct timespec64 *ts); +#endif /* HAVE_KTIME_GET_TS */ -#if 0 -static inline cfs_duration_t cfs_duration_build(int64_t nano) -{ -#if (BITS_PER_LONG == 32) - /* We cannot use do_div(t, ONE_BILLION), do_div can only process - * 64 bits n and 32 bits base */ - int64_t t = nano * HZ; - do_div(t, 1000); - do_div(t, 1000000); - return (cfs_duration_t)t; -#else - return (nano * HZ / ONE_BILLION); -#endif -} -#endif +#ifndef HAVE_KTIME_GET_REAL_TS64 +void ktime_get_real_ts64(struct timespec64 *ts); +#endif /* HAVE_KTIME_GET_REAL_TS */ + +#ifndef HAVE_KTIME_GET_REAL_SECONDS +time64_t ktime_get_real_seconds(void); +#endif /* HAVE_KTIME_GET_REAL_SECONDS */ + +#ifndef HAVE_KTIME_GET_SECONDS +time64_t ktime_get_seconds(void); +#endif /* HAVE_KTIME_GET_SECONDS */ -static inline cfs_duration_t cfs_time_seconds(int seconds) +#ifdef NEED_KTIME_GET_NS +static inline u64 ktime_get_ns(void) { - return ((cfs_duration_t)seconds) * HZ; + return ktime_to_ns(ktime_get()); } +#endif /* NEED_KTIME_GET_NS */ -static inline time_t cfs_duration_sec(cfs_duration_t d) +#ifdef NEED_KTIME_GET_REAL_NS +static inline u64 ktime_get_real_ns(void) { - return d / HZ; + return ktime_to_ns(ktime_get_real()); } +#endif /* NEED_KTIME_GET_REAL_NS */ -static inline void cfs_duration_usec(cfs_duration_t d, struct timeval *s) +#ifndef HAVE_KTIME_MS_DELTA +static inline s64 ktime_ms_delta(const ktime_t later, const ktime_t earlier) { -#if (BITS_PER_LONG == 32) && (HZ > 4096) - __u64 t; - - s->tv_sec = d / HZ; - t = (d - (cfs_duration_t)s->tv_sec * HZ) * ONE_MILLION; - do_div(t, HZ); - s->tv_usec = t; -#else - s->tv_sec = d / HZ; - s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * HZ) * ONE_MILLION) / HZ; -#endif + return ktime_to_ms(ktime_sub(later, earlier)); } +#endif /* HAVE_KTIME_MS_DELTA */ -static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s) +#ifndef HAVE_KTIME_TO_TIMESPEC64 +static inline struct timespec64 ktime_to_timespec64(ktime_t kt) { -#if (BITS_PER_LONG == 32) - __u64 t; + struct timespec ts = ns_to_timespec((kt).tv64); - s->tv_sec = d / HZ; - t = (d - s->tv_sec * HZ) * ONE_BILLION; - do_div(t, HZ); - s->tv_nsec = t; -#else - s->tv_sec = d / HZ; - s->tv_nsec = ((d - s->tv_sec * HZ) * ONE_BILLION) / HZ; -#endif + return timespec_to_timespec64(ts); } +#endif /* HAVE_KTIME_TO_TIMESPEC64 */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) - -#define cfs_time_current_64 get_jiffies_64 - -static inline __u64 cfs_time_add_64(__u64 t, __u64 d) +#ifndef HAVE_TIMESPEC64_SUB +static inline struct timespec64 +timespec64_sub(struct timespec64 later, struct timespec64 earlier) { - return t + d; -} + struct timespec diff; -static inline __u64 cfs_time_shift_64(int seconds) -{ - return cfs_time_add_64(cfs_time_current_64(), - cfs_time_seconds(seconds)); + diff = timespec_sub(timespec64_to_timespec(later), + timespec64_to_timespec(earlier)); + return timespec_to_timespec64(diff); } +#endif -static inline int cfs_time_before_64(__u64 t1, __u64 t2) +#ifndef HAVE_TIMESPEC64_TO_KTIME +static inline ktime_t timespec64_to_ktime(struct timespec64 ts) { - return (__s64)t2 - (__s64)t1 > 0; + return ktime_set(ts.tv_sec, ts.tv_nsec); } +#endif -static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2) +static inline unsigned long cfs_time_seconds(time64_t seconds) { - return (__s64)t2 - (__s64)t1 >= 0; + return nsecs_to_jiffies64(seconds * NSEC_PER_SEC); } -#else -#define cfs_time_current_64 cfs_time_current -#define cfs_time_add_64 cfs_time_add -#define cfs_time_shift_64 cfs_time_shift -#define cfs_time_before_64 cfs_time_before -#define cfs_time_beforeq_64 cfs_time_beforeq -#endif +#ifdef HAVE_NEW_DEFINE_TIMER +# ifndef TIMER_DATA_TYPE +# define TIMER_DATA_TYPE struct timer_list * +# endif -/* - * One jiffy - */ -#define CFS_TICK (1) +#define CFS_DEFINE_TIMER(_name, _function, _expires, _data) \ + DEFINE_TIMER((_name), (_function)) +#else +# ifndef TIMER_DATA_TYPE +# define TIMER_DATA_TYPE unsigned long +# endif -#define CFS_TIME_T "%lu" -#define CFS_DURATION_T "%ld" +#define CFS_DEFINE_TIMER(_name, _function, _expires, _data) \ + DEFINE_TIMER((_name), (_function), (_expires), (_data)) +#endif -#define cfs_do_gettimeofday(tv) do_gettimeofday(tv) +#ifdef HAVE_TIMER_SETUP +#define cfs_timer_cb_arg_t struct timer_list * +#define cfs_from_timer(var, callback_timer, timer_fieldname) \ + from_timer(var, callback_timer, timer_fieldname) +#define cfs_timer_setup(timer, callback, data, flags) \ + timer_setup((timer), (callback), (flags)) +#define cfs_timer_cb_arg(var, timer_fieldname) (&(var)->timer_fieldname) +#else +#define cfs_timer_cb_arg_t unsigned long +#define cfs_from_timer(var, data, timer_fieldname) (typeof(var))(data) +#define cfs_timer_setup(timer, callback, data, flags) \ + setup_timer((timer), (callback), (data)) +#define cfs_timer_cb_arg(var, timer_fieldname) (cfs_timer_cb_arg_t)(var) +#endif #endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */ -/* - * Local variables: - * c-indentation-style: "K&R" - * c-basic-offset: 8 - * tab-width: 8 - * fill-column: 80 - * scroll-step: 1 - * End: - */