X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-time.h;h=7c41643e9b304bd572f8be878a432c4310c08c43;hb=c6ed413f09efa7776ea78c7010cb2e71f8c966b3;hp=6fcb7511cb2fd8f1c117b1b7c5f494dc4eba4af2;hpb=2dc1bb8b7a53077fce8632aabe65b2ce8048a550;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/linux/linux-time.h b/libcfs/include/libcfs/linux/linux-time.h index 6fcb751..7c41643 100644 --- a/libcfs/include/libcfs/linux/linux-time.h +++ b/libcfs/include/libcfs/linux/linux-time.h @@ -26,6 +26,8 @@ /* * 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/ @@ -61,9 +63,6 @@ * 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); @@ -76,13 +75,6 @@ * 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 * @@ -98,46 +90,53 @@ #include #include #include +#include +#include #include #include -#include - /* - * post 2.5 kernels. + * Generic kernel stuff */ -#include +typedef unsigned long cfs_time_t; /* jiffies */ +typedef long cfs_duration_t; +typedef cycles_t cfs_cycles_t; -typedef struct timespec cfs_fs_time_t; +#ifndef HAVE_TIMESPEC64 -static inline void cfs_fs_time_usec(cfs_fs_time_t *t, struct timeval *v) -{ - v->tv_sec = t->tv_sec; - v->tv_usec = t->tv_nsec / 1000; -} +typedef __s64 time64_t; + +#if __BITS_PER_LONG == 64 -static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s) +# define timespec64 timespec + +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) { - *s = *t; + 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) +#else +struct timespec64 { + time64_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; + +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) { - return (unsigned long long)t->tv_sec * ONE_BILLION + t->tv_nsec; + struct timespec64 ret; + + ret.tv_sec = ts.tv_sec; + ret.tv_nsec = ts.tv_nsec; + return ret; } +#endif /* __BITS_PER_LONG != 64 */ +#endif /* HAVE_TIMESPEC64 */ -/* - * Generic kernel stuff - */ - -typedef unsigned long cfs_time_t; /* jiffies */ -typedef long cfs_duration_t; -typedef cycles_t cfs_cycles_t; +#ifndef HAVE_KTIME_GET_REAL_TS64 +void ktime_get_real_ts64(struct timespec64 *ts); +#endif /* HAVE_KTIME_GET_REAL_TS */ static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2) { @@ -156,83 +155,59 @@ static inline cfs_time_t cfs_time_current(void) static inline time_t cfs_time_current_sec(void) { - return CURRENT_SECONDS; + return get_seconds(); } -static inline void cfs_fs_time_current(cfs_fs_time_t *t) -{ - *t = CURRENT_TIME; -} - -static inline time_t cfs_fs_time_sec(cfs_fs_time_t *t) -{ - return t->tv_sec; -} - -static inline int cfs_fs_time_before(cfs_fs_time_t *t1, cfs_fs_time_t *t2) -{ - return __cfs_fs_time_flat(t1) < __cfs_fs_time_flat(t2); -} - -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); -} - -#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 - static inline cfs_duration_t cfs_time_seconds(int seconds) { - return ((cfs_duration_t)seconds) * HZ; + + return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC); } static inline time_t cfs_duration_sec(cfs_duration_t d) { - return d / HZ; + + return d / msecs_to_jiffies(MSEC_PER_SEC); } static inline void cfs_duration_usec(cfs_duration_t d, struct timeval *s) { -#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; +#if (BITS_PER_LONG == 32) + if (msecs_to_jiffies(MSEC_PER_SEC) > 4096) { + __u64 t; + + s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC); + t = (d - (cfs_duration_t)s->tv_sec * + msecs_to_jiffies(MSEC_PER_SEC)) * USEC_PER_SEC; + do_div(t, msecs_to_jiffies(MSEC_PER_SEC)); + s->tv_usec = t; + } else { + s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC); + s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * + msecs_to_jiffies(MSEC_PER_SEC)) * + USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC); + } #else - s->tv_sec = d / HZ; - s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * HZ) * \ - ONE_MILLION) / HZ; + s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC); + s->tv_usec = ((d - (cfs_duration_t)s->tv_sec * + msecs_to_jiffies(MSEC_PER_SEC)) * + USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC); #endif } static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s) { #if (BITS_PER_LONG == 32) - __u64 t; + __u64 t; - s->tv_sec = d / HZ; - t = (d - s->tv_sec * HZ) * ONE_BILLION; - do_div(t, HZ); - s->tv_nsec = t; + s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC); + t = (d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) * NSEC_PER_SEC; + do_div(t, msecs_to_jiffies(MSEC_PER_SEC)); + s->tv_nsec = t; #else - s->tv_sec = d / HZ; - s->tv_nsec = ((d - s->tv_sec * HZ) * ONE_BILLION) / HZ; + s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC); + s->tv_nsec = ((d - s->tv_sec * msecs_to_jiffies(MSEC_PER_SEC)) * + NSEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC); #endif } @@ -259,12 +234,9 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2) return (__s64)t2 - (__s64)t1 >= 0; } - /* * One jiffy */ -#define CFS_TICK (1) - #define CFS_TIME_T "%lu" #define CFS_DURATION_T "%ld"