#ifndef __LIBCFS_LINUX_LINUX_TIME_H__
#define __LIBCFS_LINUX_LINUX_TIME_H__
-#ifndef __LIBCFS_LIBCFS_H__
-#error Do not #include this file directly. #include <libcfs/libcfs.h> 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_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_impl_time_before (cfs_time_t, cfs_time_t);
- * int cfs_impl_time_before_eq(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 *);
- *
- * 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
-
+#include <linux/hrtimer.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/version.h>
#include <linux/jiffies.h>
+#include <linux/hrtimer.h>
#include <linux/types.h>
#include <linux/time.h>
#include <asm/div64.h>
/*
* Generic kernel stuff
*/
-
-typedef unsigned long cfs_time_t; /* jiffies */
-typedef long cfs_duration_t;
-
#ifndef HAVE_TIMESPEC64
typedef __s64 time64_t;
return ts;
}
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts)
+{
+ return ts;
+}
+
#else
struct timespec64 {
time64_t tv_sec; /* seconds */
ret.tv_nsec = ts.tv_nsec;
return ret;
}
+
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+ struct timespec ret;
+
+ ret.tv_sec = (time_t)ts64.tv_sec;
+ ret.tv_nsec = ts64.tv_nsec;
+ return ret;
+}
#endif /* __BITS_PER_LONG != 64 */
#endif /* HAVE_TIMESPEC64 */
+#ifndef HAVE_NS_TO_TIMESPEC64
+static inline struct timespec64 ns_to_timespec64(const s64 nsec)
+{
+ struct timespec64 ts;
+ s32 rem;
+
+ 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;
+
+ return ts;
+}
+#endif
+
+#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 cmp1.tv64 > cmp2.tv64;
+}
+#endif /* !HAVE_KTIME_AFTER */
+
+#ifndef HAVE_KTIME_BEFORE
+static inline bool ktime_before(const ktime_t cmp1, const ktime_t cmp2)
+{
+ return cmp1.tv64 < cmp2.tv64;
+}
+#endif /* !HAVE_KTIME_BEFORE */
+
+#ifndef HAVE_KTIME_COMPARE
+static inline int ktime_compare(const ktime_t cmp1, const ktime_t cmp2)
+{
+ if (cmp1.tv64 < cmp2.tv64)
+ return -1;
+ if (cmp1.tv64 > cmp2.tv64)
+ return 1;
+ return 0;
+}
+#endif /* !HAVE_KTIME_COMPARE */
+
#ifndef HAVE_KTIME_GET_TS64
void ktime_get_ts64(struct timespec64 *ts);
#endif /* HAVE_KTIME_GET_TS */
time64_t ktime_get_seconds(void);
#endif /* HAVE_KTIME_GET_SECONDS */
-#ifndef HAVE_KTIME_GET_REAL_NS
-static inline u64 ktime_get_real_ns(void)
-{
- return ktime_to_ns(ktime_get_real());
-}
-#endif /* HAVE_KTIME_GET_NS */
-
-static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
+#ifdef NEED_KTIME_GET_NS
+static inline u64 ktime_get_ns(void)
{
- return time_before(t1, t2);
+ return ktime_to_ns(ktime_get());
}
+#endif /* NEED_KTIME_GET_NS */
-static inline int cfs_time_beforeq(cfs_time_t t1, cfs_time_t t2)
-{
- return time_before_eq(t1, t2);
-}
-
-static inline cfs_time_t cfs_time_current(void)
+#ifdef NEED_KTIME_GET_REAL_NS
+static inline u64 ktime_get_real_ns(void)
{
- return jiffies;
+ return ktime_to_ns(ktime_get_real());
}
+#endif /* NEED_KTIME_GET_REAL_NS */
-static inline time_t cfs_time_current_sec(void)
+#ifndef HAVE_KTIME_MS_DELTA
+static inline s64 ktime_ms_delta(const ktime_t later, const ktime_t earlier)
{
- return get_seconds();
+ return ktime_to_ms(ktime_sub(later, earlier));
}
+#endif /* HAVE_KTIME_MS_DELTA */
-static inline cfs_duration_t cfs_time_seconds(int seconds)
+#ifndef HAVE_KTIME_TO_TIMESPEC64
+static inline struct timespec64 ktime_to_timespec64(ktime_t kt)
{
+ struct timespec ts = ns_to_timespec((kt).tv64);
- return ((cfs_duration_t)seconds) * msecs_to_jiffies(MSEC_PER_SEC);
+ return timespec_to_timespec64(ts);
}
+#endif /* HAVE_KTIME_TO_TIMESPEC64 */
-static inline time_t cfs_duration_sec(cfs_duration_t d)
+#ifndef HAVE_TIMESPEC64_SUB
+static inline struct timespec64
+timespec64_sub(struct timespec64 later, struct timespec64 earlier)
{
+ struct timespec diff;
- return d / msecs_to_jiffies(MSEC_PER_SEC);
+ diff = timespec_sub(timespec64_to_timespec(later),
+ timespec64_to_timespec(earlier));
+ return timespec_to_timespec64(diff);
}
-
-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)
+#ifndef HAVE_TIMESPEC64_TO_KTIME
+static inline ktime_t timespec64_to_ktime(struct timespec64 ts)
{
-#if (BITS_PER_LONG == 32)
- __u64 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 / 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
-}
-
-#define cfs_time_current_64 get_jiffies_64
-
-static inline __u64 cfs_time_add_64(__u64 t, __u64 d)
-{
- return t + d;
+ return ktime_set(ts.tv_sec, ts.tv_nsec);
}
+#endif
-static inline __u64 cfs_time_shift_64(int seconds)
+static inline unsigned long cfs_time_seconds(time64_t seconds)
{
- return cfs_time_add_64(cfs_time_current_64(),
- cfs_time_seconds(seconds));
+ return nsecs_to_jiffies64(seconds * NSEC_PER_SEC);
}
-static inline int cfs_time_before_64(__u64 t1, __u64 t2)
-{
- return (__s64)t2 - (__s64)t1 > 0;
-}
+#ifdef HAVE_NEW_DEFINE_TIMER
+# ifndef TIMER_DATA_TYPE
+# define TIMER_DATA_TYPE struct timer_list *
+# endif
-static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2)
-{
- return (__s64)t2 - (__s64)t1 >= 0;
-}
+#define CFS_DEFINE_TIMER(_name, _function, _expires, _data) \
+ DEFINE_TIMER((_name), (_function))
+#else
+# ifndef TIMER_DATA_TYPE
+# define TIMER_DATA_TYPE unsigned long
+# endif
-/*
- * One jiffy
- */
-#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
+#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:
- */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff