Author: johalun
Date: Wed May 15 16:59:04 2019
New Revision: 347619
URL: https://svnweb.freebsd.org/changeset/base/347619
Log:
LinuxKPI: Expand ktime functionality.
Also, make ktime_get_raw call getnanouptime instead of getnanotime
to match (the correct) ktime_get_raw_ns.
This patch is part of D19565
Reviewed by: hps
Approved by: imp (mentor), hps
MFC after: 1 week
Modified:
head/sys/compat/linuxkpi/common/include/linux/ktime.h
Modified: head/sys/compat/linuxkpi/common/include/linux/ktime.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/ktime.h Wed May 15
16:51:08 2019 (r347618)
+++ head/sys/compat/linuxkpi/common/include/linux/ktime.h Wed May 15
16:59:04 2019 (r347619)
@@ -35,8 +35,6 @@
#include <linux/time.h>
#include <linux/jiffies.h>
-#define ktime_get_ts(x) getnanouptime(x)
-
/* time values in nanoseconds */
typedef s64 ktime_t;
@@ -93,6 +91,13 @@ ktime_add_ms(ktime_t kt, int64_t ms)
}
static inline ktime_t
+ktime_add_us(ktime_t kt, int64_t us)
+{
+
+ return (ktime_add_ns(kt, us * NSEC_PER_USEC));
+}
+
+static inline ktime_t
ktime_sub_ns(ktime_t kt, int64_t ns)
{
return (kt - ns);
@@ -172,11 +177,20 @@ timeval_to_ktime(struct timeval tv)
return (ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC));
}
+static inline int64_t
+timespec64_to_ns(struct timespec64 *ts)
+{
+ return (timespec_to_ns(ts));
+}
+
#define ktime_to_timespec(kt) ns_to_timespec(kt)
#define ktime_to_timespec64(kt) ns_to_timespec(kt)
#define ktime_to_timeval(kt) ns_to_timeval(kt)
#define ktime_to_ns(kt) (kt)
-#define ktime_get_ts64(ts) ktime_get_ts(ts)
+#define ktime_get_ts(ts) getnanouptime(ts)
+#define ktime_get_ts64(ts) getnanouptime(ts)
+#define ktime_get_raw_ts64(ts) getnanouptime(ts)
+#define getrawmonotonic64(ts) getnanouptime(ts)
static inline int64_t
ktime_get_ns(void)
@@ -229,7 +243,7 @@ ktime_get_raw(void)
{
struct timespec ts;
- nanotime(&ts);
+ nanouptime(&ts);
return (timespec_to_ktime(ts));
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
