From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Nov 2022 17:30:39 +0000 (-0500)
Subject: Drop 'wrapper/time.h' wrapper
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=df125a61b8365b96819ca3a8ace5bc6f35f958b5;p=lttng-modules.git

Drop 'wrapper/time.h' wrapper

Change-Id: I15ae7f5436e5fc2dfa2b0f9b878810a07fe8a5e9
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/wrapper/time.h b/include/wrapper/time.h
deleted file mode 100644
index ad424dcf..00000000
--- a/include/wrapper/time.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/time.h
- *
- * Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
- * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_TIME_H
-#define _LTTNG_WRAPPER_TIME_H
-
-#include <lttng/kernel-version.h>
-
-/*
- * Use 64bit timespec on kernels that have it, this makes 32bit arch
- * y2038 compliant.
- */
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0))
-# define LTTNG_KERNEL_HAS_TIMESPEC64
-#endif
-
-#endif /* _LTTNG_WRAPPER_TIME_H */
diff --git a/src/lttng-events.c b/src/lttng-events.c
index 472440e1..431da540 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -46,7 +46,6 @@
 #include <lttng/utils.h>
 #include <ringbuffer/backend.h>
 #include <ringbuffer/frontend.h>
-#include <wrapper/time.h>
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
 #include <linux/stdarg.h>
@@ -3688,20 +3687,12 @@ int64_t measure_clock_offset(void)
 	uint64_t tcf = trace_clock_freq();
 	int64_t offset;
 	unsigned long flags;
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
 	struct timespec64 rts = { 0, 0 };
-#else
-	struct timespec rts = { 0, 0 };
-#endif
 
 	/* Disable interrupts to increase correlation precision. */
 	local_irq_save(flags);
 	monotonic[0] = trace_clock_read64();
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
 	ktime_get_real_ts64(&rts);
-#else
-	getnstimeofday(&rts);
-#endif
 	monotonic[1] = trace_clock_read64();
 	local_irq_restore(flags);