From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: fady@mellanox.com, thomas@monjalon.net, tbashar@mellanox.com,
talshn@mellanox.com, yohadt@mellanox.com,
dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com,
ocardona@microsoft.com, pallavi.kadam@intel.com,
ranjit.menon@intel.com
Subject: [dpdk-dev] [PATCH v10 2/2] timer: support EAL functions on Windows
Date: Thu, 18 Jun 2020 09:55:22 +0300 [thread overview]
Message-ID: <20200618065522.22884-3-fady@mellanox.com> (raw)
In-Reply-To: <20200618065522.22884-1-fady@mellanox.com>
Implemented the needed Windows eal timer functions.
Signed-off-by: Fady Bader <fady@mellanox.com>
---
lib/librte_eal/common/meson.build | 1 +
lib/librte_eal/windows/eal.c | 6 +++
lib/librte_eal/windows/eal_timer.c | 93 +++++++++++++++++++++++++++++++++
lib/librte_eal/windows/include/rte_os.h | 2 +
lib/librte_eal/windows/meson.build | 1 +
5 files changed, 103 insertions(+)
create mode 100644 lib/librte_eal/windows/eal_timer.c
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 3108442697..4bdf77922f 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -26,6 +26,7 @@ if is_windows
'malloc_elem.c',
'malloc_heap.c',
'rte_malloc.c',
+ 'eal_common_timer.c',
)
subdir_done()
endif
diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
index 427a5557fa..b6bffd3d92 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -354,6 +354,12 @@ rte_eal_init(int argc, char **argv)
return -1;
}
+ if (rte_eal_timer_init() < 0) {
+ rte_eal_init_alert("Cannot init TSC timer");
+ rte_errno = EFAULT;
+ return -1;
+ }
+
eal_thread_init_master(rte_config.master_lcore);
RTE_LCORE_FOREACH_SLAVE(i) {
diff --git a/lib/librte_eal/windows/eal_timer.c b/lib/librte_eal/windows/eal_timer.c
new file mode 100644
index 0000000000..1f0cae631c
--- /dev/null
+++ b/lib/librte_eal/windows/eal_timer.c
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+#include <inttypes.h>
+
+#include <rte_windows.h>
+#include <rte_common.h>
+#include <rte_cycles.h>
+#include <rte_eal.h>
+#include <rte_errno.h>
+#include "eal_private.h"
+
+#define US_PER_SEC 1E6
+#define CYC_PER_10MHZ 1E7
+
+void
+rte_delay_us_sleep(unsigned int us)
+{
+ HANDLE timer;
+ LARGE_INTEGER due_time;
+
+ /* create waitable timer */
+ timer = CreateWaitableTimer(NULL, TRUE, NULL);
+ if (!timer) {
+ RTE_LOG_WIN32_ERR("CreateWaitableTimer()");
+ rte_errno = ENOMEM;
+ return;
+ }
+
+ /*
+ * due_time's uom is 100 ns, multiply by 10 to convert to microseconds
+ * set us microseconds time for timer
+ */
+ due_time.QuadPart = -((int64_t)us * 10);
+ if (!SetWaitableTimer(timer, &due_time, 0, NULL, NULL, FALSE)) {
+ RTE_LOG_WIN32_ERR("SetWaitableTimer()");
+ rte_errno = EINVAL;
+ goto end;
+ }
+ /* start wait for timer for us microseconds */
+ if (WaitForSingleObject(timer, INFINITE) == WAIT_FAILED) {
+ RTE_LOG_WIN32_ERR("WaitForSingleObject()");
+ rte_errno = EINVAL;
+ }
+
+end:
+ CloseHandle(timer);
+}
+
+uint64_t
+get_tsc_freq(void)
+{
+ LARGE_INTEGER t_start, t_end, elapsed_us;
+ LARGE_INTEGER frequency;
+ uint64_t tsc_hz;
+ uint64_t end, start;
+
+ QueryPerformanceFrequency(&frequency);
+
+ QueryPerformanceCounter(&t_start);
+ start = rte_get_tsc_cycles();
+
+ rte_delay_us_sleep(US_PER_SEC / 10); /* 1/10 second */
+
+ if (rte_errno != 0)
+ return 0;
+
+ QueryPerformanceCounter(&t_end);
+ end = rte_get_tsc_cycles();
+
+ elapsed_us.QuadPart = t_end.QuadPart - t_start.QuadPart;
+
+ /*
+ * To guard against loss-of-precision, convert to microseconds
+ * *before* dividing by ticks-per-second.
+ */
+ elapsed_us.QuadPart *= US_PER_SEC;
+ elapsed_us.QuadPart /= frequency.QuadPart;
+
+ double secs = ((double)elapsed_us.QuadPart)/US_PER_SEC;
+ tsc_hz = (uint64_t)((end - start)/secs);
+
+ /* Round up to 10Mhz. 1E7 ~ 10Mhz */
+ return RTE_ALIGN_MUL_NEAR(tsc_hz, CYC_PER_10MHZ);
+}
+
+
+int
+rte_eal_timer_init(void)
+{
+ set_tsc_freq();
+ return 0;
+}
diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h
index cb10d6494f..569ed92d51 100644
--- a/lib/librte_eal/windows/include/rte_os.h
+++ b/lib/librte_eal/windows/include/rte_os.h
@@ -25,6 +25,8 @@ extern "C" {
#define PATH_MAX _MAX_PATH
#endif
+#define sleep(x) Sleep(1000 * (x))
+
#define strerror_r(a, b, c) strerror_s(b, c, a)
/* strdup is deprecated in Microsoft libc and _strdup is preferred */
diff --git a/lib/librte_eal/windows/meson.build b/lib/librte_eal/windows/meson.build
index ded5a2b808..08c888e018 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -14,6 +14,7 @@ sources += files(
'eal_memory.c',
'eal_mp.c',
'eal_thread.c',
+ 'eal_timer.c',
'fnmatch.c',
'getopt.c',
)
--
2.16.1.windows.4
next prev parent reply other threads:[~2020-06-18 6:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 14:43 [dpdk-dev] [PATCH 0/2] eal timer split and implementation for Windows Fady Bader
2020-04-23 14:43 ` [dpdk-dev] [PATCH 1/2] timer: move from common to Unix directory Fady Bader
2020-06-17 9:39 ` [dpdk-dev] [PATCH v9 0/2] eal timer split and implementation for Windows Fady Bader
2020-06-17 9:39 ` [dpdk-dev] [PATCH v9 1/2] timer: move from common to Unix directory Fady Bader
2020-06-17 9:39 ` [dpdk-dev] [PATCH v9 2/2] timer: support EAL functions on Windows Fady Bader
2020-06-17 22:15 ` Ranjit Menon
2020-06-18 7:56 ` Fady Bader
2020-06-18 6:55 ` [dpdk-dev] [PATCH v10 0/2] eal timer split and implementation for Windows Fady Bader
2020-06-18 6:55 ` [dpdk-dev] [PATCH v10 1/2] timer: move from common to Unix directory Fady Bader
2020-06-18 6:55 ` Fady Bader [this message]
2020-06-18 19:32 ` [dpdk-dev] [PATCH v10 0/2] eal timer split and implementation for Windows Ranjit Menon
2020-06-23 16:19 ` Thomas Monjalon
2020-04-23 14:43 ` [dpdk-dev] [PATCH 2/2] timer: support EAL functions on Windows Fady Bader
2020-04-23 15:18 ` Dmitry Kozlyuk
2020-04-24 21:32 ` Dmitry Kozlyuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200618065522.22884-3-fady@mellanox.com \
--to=fady@mellanox.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=harini.ramakrishnan@microsoft.com \
--cc=ocardona@microsoft.com \
--cc=pallavi.kadam@intel.com \
--cc=ranjit.menon@intel.com \
--cc=talshn@mellanox.com \
--cc=tbashar@mellanox.com \
--cc=thomas@monjalon.net \
--cc=yohadt@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).