Merge remote-tracking branch 'salsa/master'

1 files changed, 18 insertions, 7 deletions

diff --git a/shared/nm-glib-aux/nm-time-utils.h b/shared/nm-glib-aux/nm-time-utils.h
index 7e4f4f25..52d6637d 100644
--- a/shared/nm-glib-aux/nm-time-utils.h
+++ b/shared/nm-glib-aux/nm-time-utils.h
@@ -21,6 +21,22 @@
 #ifndef __NM_TIME_UTILS_H__
 #define __NM_TIME_UTILS_H__
 
+#include <time.h>
+
+static inline gint64
+nm_utils_timespec_to_ns (const struct timespec *ts)
+{
+	return   (((gint64) ts->tv_sec) * ((gint64) NM_UTILS_NS_PER_SECOND))
+	       +  ((gint64) ts->tv_nsec);
+}
+
+static inline gint64
+nm_utils_timespec_to_ms (const struct timespec *ts)
+{
+	return   (((gint64) ts->tv_sec)  * ((gint64) 1000))
+	       + (((gint64) ts->tv_nsec) / ((gint64) NM_UTILS_NS_PER_SECOND / 1000));
+}
+
 gint64 nm_utils_get_monotonic_timestamp_ns (void);
 gint64 nm_utils_get_monotonic_timestamp_us (void);
 gint64 nm_utils_get_monotonic_timestamp_ms (void);
@@ -34,12 +50,7 @@ nm_utils_get_monotonic_timestamp_ns_cached (gint64 *cache_now)
 	       ?: (*cache_now = nm_utils_get_monotonic_timestamp_ns ());
 }
 
-struct timespec;
-
-/* this function must be implemented to handle the notification when
- * the first monotonic-timestamp is fetched. */
-extern void _nm_utils_monotonic_timestamp_initialized (const struct timespec *tp,
-                                                       gint64 offset_sec,
-                                                       gboolean is_boottime);
+gint64 nm_utils_clock_gettime_ns (clockid_t clockid);
+gint64 nm_utils_clock_gettime_ms (clockid_t clockid);
 
 #endif /* __NM_TIME_UTILS_H__ */