*
* 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>
/*
- * post 2.5 kernels.
+ * Generic kernel stuff
*/
-#include <linux/jiffies.h>
+typedef unsigned long cfs_time_t; /* jiffies */
+typedef long cfs_duration_t;
+
+#ifndef HAVE_TIMESPEC64
+
+typedef __s64 time64_t;
+
+#if __BITS_PER_LONG == 64
-typedef struct timespec cfs_fs_time_t;
+# define timespec64 timespec
-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;
+ return ts;
}
-static inline void cfs_fs_time_nsec(cfs_fs_time_t *t, struct timespec *s)
+static inline struct timespec timespec64_to_timespec(const struct timespec64 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 * NSEC_PER_SEC + t->tv_nsec;
+ struct timespec64 ret;
+
+ ret.tv_sec = ts.tv_sec;
+ ret.tv_nsec = ts.tv_nsec;
+ return ret;
}
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+ struct timespec ret;
-/*
- * Generic kernel stuff
- */
+ ret.tv_sec = (time_t)ts64.tv_sec;
+ ret.tv_nsec = ts64.tv_nsec;
+ return ret;
+}
+#endif /* __BITS_PER_LONG != 64 */
-typedef unsigned long cfs_time_t; /* jiffies */
-typedef long cfs_duration_t;
-typedef cycles_t cfs_cycles_t;
+#endif /* HAVE_TIMESPEC64 */
-static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
+#ifndef HAVE_KTIME_ADD
+# define ktime_add(lhs, rhs) ({ (ktime_t){ .tv64 = (lhs).tv64 + (rhs).tv64 }; })
+#endif /* !HAVE_KTIME_ADD */
+
+#ifndef HAVE_KTIME_AFTER
+static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2)
{
- return time_before(t1, t2);
+ return cmp1.tv64 > cmp2.tv64;
}
+#endif /* !HAVE_KTIME_AFTER */
-static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2)
+#ifndef HAVE_KTIME_GET_TS64
+void ktime_get_ts64(struct timespec64 *ts);
+#endif /* HAVE_KTIME_GET_TS */
+
+#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 time_before_eq(t1, t2);
+ return ktime_to_ns(ktime_get_real());
}
+#endif /* NEED_KTIME_GET_REAL_NS */
-static inline cfs_time_t cfs_time_current(void)
+#ifndef HAVE_KTIME_TO_TIMESPEC64
+static inline struct timespec64 ktime_to_timespec64(ktime_t kt)
{
- return jiffies;
+ struct timespec ts = ns_to_timespec((kt).tv64);
+
+ return timespec_to_timespec64(ts);
}
+#endif /* HAVE_KTIME_TO_TIMESPEC64 */
-static inline time_t cfs_time_current_sec(void)
+#ifndef HAVE_TIMESPEC64_SUB
+static inline struct timespec64
+timespec64_sub(struct timespec64 later, struct timespec64 earlier)
{
- return get_seconds();
+ struct timespec diff;
+
+ diff = timespec_sub(timespec64_to_timespec(later),
+ timespec64_to_timespec(earlier));
+ return timespec_to_timespec64(diff);
}
+#endif
-static inline void cfs_fs_time_current(cfs_fs_time_t *t)
+#ifndef HAVE_TIMESPEC64_TO_KTIME
+static inline ktime_t timespec64_to_ktime(struct timespec64 ts)
{
- *t = CURRENT_TIME;
+ return ktime_set(ts.tv_sec, ts.tv_nsec);
+}
+#endif
+
+static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
+{
+ return time_before(t1, t2);
}
-static inline time_t cfs_fs_time_sec(cfs_fs_time_t *t)
+static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2)
{
- return t->tv_sec;
+ return time_before_eq(t1, t2);
}
-static inline int cfs_fs_time_before(cfs_fs_time_t *t1, cfs_fs_time_t *t2)
+static inline cfs_time_t cfs_time_current(void)
{
- return __cfs_fs_time_flat(t1) < __cfs_fs_time_flat(t2);
+ return jiffies;
}
-static inline int cfs_fs_time_beforeq(cfs_fs_time_t *t1, cfs_fs_time_t *t2)
+static inline time_t cfs_time_current_sec(void)
{
- return __cfs_fs_time_flat(t1) <= __cfs_fs_time_flat(t2);
+ return get_seconds();
}
static inline cfs_duration_t cfs_time_seconds(int seconds)
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)
- 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 / 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)
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