*
* 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 (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/
* 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);
* 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
*
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/version.h>
+#include <linux/jiffies.h>
+#include <linux/types.h>
#include <linux/time.h>
#include <asm/div64.h>
-#include <libcfs/linux/portals_compat25.h>
-
/*
- * post 2.5 kernels.
+ * Generic kernel stuff
*/
-#include <linux/jiffies.h>
+typedef unsigned long cfs_time_t; /* jiffies */
+typedef long cfs_duration_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
+
+# 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 = *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
- */
+#ifndef HAVE_KTIME_GET_TS64
+void ktime_get_ts64(struct timespec64 *ts);
+#endif /* HAVE_KTIME_GET_TS */
-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 */
+
+#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 */
+
+#ifdef NEED_KTIME_GET_REAL_NS
+static inline u64 ktime_get_real_ns(void)
+{
+ return ktime_to_ns(ktime_get_real());
+}
+#endif /* NEED_KTIME_GET_REAL_NS */
static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
{
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
}
return (__s64)t2 - (__s64)t1 >= 0;
}
-
/*
* One jiffy
*/
-#define CFS_TICK (1)
-
#define CFS_TIME_T "%lu"
#define CFS_DURATION_T "%ld"
git://git.whamcloud.com / fs / lustre-release.git / blobdiff