[v8,05/10] app/testpmd: add clock_gettime on Windows

Message ID 1619553721-5220-6-git-send-email-jizh@linux.microsoft.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series app/testpmd: enable testpmd on Windows |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Jie Zhou April 27, 2021, 8:01 p.m. UTC
  Add clock_gettime for testpmd on Windows in config.h

Signed-off-by: Jie Zhou <jizh@microsoft.com>
Signed-off-by: Jie Zhou <jizh@linux.microsoft.com>
---
 app/test-pmd/config.c | 10 ++-----
 app/test-pmd/config.h | 66 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 app/test-pmd/config.h
  

Patch

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e189062ef..9fbf2f5f7 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -54,17 +54,10 @@ 
 
 #include "testpmd.h"
 #include "cmdline_mtr.h"
+#include "config.h"
 
 #define ETHDEV_FWVERS_LEN 32
 
-#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
-#else
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC
-#endif
-
-#define NS_PER_SEC 1E9
-
 static char *flowtype_to_str(uint16_t flow_type);
 
 static const struct {
@@ -205,6 +198,7 @@  nic_stats_display(portid_t port_id)
 	       "%-"PRIu64"\n", stats.opackets, stats.oerrors, stats.obytes);
 
 	diff_ns = 0;
+
 	if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) {
 		uint64_t ns;
 
diff --git a/app/test-pmd/config.h b/app/test-pmd/config.h
new file mode 100644
index 000000000..16599c9d5
--- /dev/null
+++ b/app/test-pmd/config.h
@@ -0,0 +1,66 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+#include <rte_os_shim.h>
+
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
+#define NS_PER_SEC 1E9
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+
+/* Identifier for system-wide realtime clock. */
+#define CLOCK_REALTIME			0
+/* Monotonic system-wide clock. */
+#define CLOCK_MONOTONIC			1
+/* High-resolution timer from the CPU. */
+#define CLOCK_PROCESS_CPUTIME_ID	2
+/* Thread-specific CPU-time clock. */
+#define CLOCK_THREAD_CPUTIME_ID		3
+
+typedef int clockid_t;
+
+#ifndef clock_gettime
+#define clock_gettime _clock_gettime
+#endif
+
+static int
+_clock_gettime(clockid_t clock_id, struct timespec *tp)
+{
+	LARGE_INTEGER pf, pc;
+	LONGLONG nsec;
+
+	switch (clock_id) {
+	case CLOCK_REALTIME:
+		if (timespec_get(tp, TIME_UTC) != TIME_UTC)
+			return -1;
+
+		return 0;
+	case CLOCK_MONOTONIC:
+		if (QueryPerformanceFrequency(&pf) == 0)
+			return -1;
+
+		if (QueryPerformanceCounter(&pc) == 0)
+			return -1;
+
+		nsec = pc.QuadPart * NS_PER_SEC / pf.QuadPart;
+		tp->tv_sec = nsec / NS_PER_SEC;
+		tp->tv_nsec = nsec - tp->tv_sec * NS_PER_SEC;
+
+		return 0;
+	default:
+		return -1;
+	}
+}
+
+#endif /* RTE_EXEC_ENV_WINDOWS */
+
+#endif /* _CONFIG_H_ */