* [dpdk-dev] [PATCH v6 1/3] timer: move from common to Unix directory
2020-05-10 12:03 [dpdk-dev] [PATCH v6 0/3] eal timer split and implementation for Windows Fady Bader
@ 2020-05-10 12:03 ` Fady Bader
2020-05-10 12:03 ` [dpdk-dev] [PATCH v6 2/3] eal: proc type function for Windows Fady Bader
2020-05-10 12:03 ` [dpdk-dev] [PATCH v6 3/3] timer: support EAL functions on Windows Fady Bader
2 siblings, 0 replies; 5+ messages in thread
From: Fady Bader @ 2020-05-10 12:03 UTC (permalink / raw)
To: dev
Cc: thomas, talshn, dmitry.koziuk, yohadt, harini.ramakrishnan,
ocardona, anand.rawat, ranjit.menon
Eal common timer doesn't compile under Windows.
Compilation log:
error LNK2019:
unresolved external symbol nanosleep referenced in function
rte_delay_us_sleep
error LNK2019:
unresolved external symbol get_tsc_freq referenced in function set_tsc_freq
error LNK2019:
unresolved external symbol sleep referenced in function set_tsc_freq
The reason was that some functions called POSIX functions.
The solution was to move POSIX dependent functions from common to Unix.
Signed-off-by: Fady Bader <fady@mellanox.com>
---
lib/librte_eal/common/eal_common_timer.c | 22 ----------------------
lib/librte_eal/unix/eal_timer.c | 29 +++++++++++++++++++++++++++++
lib/librte_eal/unix/meson.build | 6 ++++++
3 files changed, 35 insertions(+), 22 deletions(-)
create mode 100644 lib/librte_eal/unix/eal_timer.c
create mode 100644 lib/librte_eal/unix/meson.build
diff --git a/lib/librte_eal/common/eal_common_timer.c b/lib/librte_eal/common/eal_common_timer.c
index fa9ee1b22..71e0bd035 100644
--- a/lib/librte_eal/common/eal_common_timer.c
+++ b/lib/librte_eal/common/eal_common_timer.c
@@ -35,28 +35,6 @@ rte_delay_us_block(unsigned int us)
rte_pause();
}
-void
-rte_delay_us_sleep(unsigned int us)
-{
- struct timespec wait[2];
- int ind = 0;
-
- wait[0].tv_sec = 0;
- if (us >= US_PER_S) {
- wait[0].tv_sec = us / US_PER_S;
- us -= wait[0].tv_sec * US_PER_S;
- }
- wait[0].tv_nsec = 1000 * us;
-
- while (nanosleep(&wait[ind], &wait[1 - ind]) && errno == EINTR) {
- /*
- * Sleep was interrupted. Flip the index, so the 'remainder'
- * will become the 'request' for a next call.
- */
- ind = 1 - ind;
- }
-}
-
uint64_t
rte_get_tsc_hz(void)
{
diff --git a/lib/librte_eal/unix/eal_timer.c b/lib/librte_eal/unix/eal_timer.c
new file mode 100644
index 000000000..cc5015910
--- /dev/null
+++ b/lib/librte_eal/unix/eal_timer.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#include <time.h>
+
+#include <rte_cycles.h>
+
+void
+rte_delay_us_sleep(unsigned int us)
+{
+ struct timespec wait[2];
+ int ind = 0;
+
+ wait[0].tv_sec = 0;
+ if (us >= US_PER_S) {
+ wait[0].tv_sec = us / US_PER_S;
+ us -= wait[0].tv_sec * US_PER_S;
+ }
+ wait[0].tv_nsec = 1000 * us;
+
+ while (nanosleep(&wait[ind], &wait[1 - ind]) && errno == EINTR) {
+ /*
+ * Sleep was interrupted. Flip the index, so the 'remainder'
+ * will become the 'request' for a next call.
+ */
+ ind = 1 - ind;
+ }
+}
diff --git a/lib/librte_eal/unix/meson.build b/lib/librte_eal/unix/meson.build
new file mode 100644
index 000000000..25929f360
--- /dev/null
+++ b/lib/librte_eal/unix/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2020 Mellanox Technologies, Ltd
+
+sources += files(
+ 'eal_timer.c',
+)
--
2.16.1.windows.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH v6 3/3] timer: support EAL functions on Windows
2020-05-10 12:03 [dpdk-dev] [PATCH v6 0/3] eal timer split and implementation for Windows Fady Bader
2020-05-10 12:03 ` [dpdk-dev] [PATCH v6 1/3] timer: move from common to Unix directory Fady Bader
2020-05-10 12:03 ` [dpdk-dev] [PATCH v6 2/3] eal: proc type function for Windows Fady Bader
@ 2020-05-10 12:03 ` Fady Bader
2020-05-11 18:48 ` Dmitry Kozlyuk
2 siblings, 1 reply; 5+ messages in thread
From: Fady Bader @ 2020-05-10 12:03 UTC (permalink / raw)
To: dev
Cc: thomas, talshn, dmitry.koziuk, yohadt, harini.ramakrishnan,
ocardona, anand.rawat, ranjit.menon
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 | 86 +++++++++++++++++++++++++++++++++
lib/librte_eal/windows/include/rte_os.h | 2 +
lib/librte_eal/windows/meson.build | 1 +
5 files changed, 96 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 155da29b4..0ea995573 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -14,6 +14,7 @@ if is_windows
'eal_common_log.c',
'eal_common_options.c',
'eal_common_thread.c',
+ 'eal_common_timer.c',
'rte_option.c',
)
subdir_done()
diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
index feee91244..203dfafdb 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -250,6 +250,12 @@ rte_eal_init(int argc, char **argv)
if (fctret < 0)
exit(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 000000000..3339d66df
--- /dev/null
+++ b/lib/librte_eal/windows/eal_timer.c
@@ -0,0 +1,86 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+#include <inttypes.h>
+#include <time.h>
+
+#include <rte_windows.h>
+#include <rte_common.h>
+#include <rte_log.h>
+#include <rte_cycles.h>
+#include <rte_pause.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)) {
+ CloseHandle(timer);
+ RTE_LOG_WIN32_ERR("SetWaitableTimer()");
+ rte_errno = EINVAL;
+ return;
+ }
+ /* start wait for timer for us microseconds */
+ WaitForSingleObject(timer, INFINITE);
+ 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 = rte_get_tsc_cycles();
+
+ QueryPerformanceFrequency(&frequency);
+ QueryPerformanceCounter(&t_start);
+
+ rte_delay_us_sleep(US_PER_SEC / 10); /* 1/10 second */
+
+ 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 510e39e03..6410b9c2f 100644
--- a/lib/librte_eal/windows/include/rte_os.h
+++ b/lib/librte_eal/windows/include/rte_os.h
@@ -24,6 +24,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 adfc8b9b7..9efbe6fd0 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -9,6 +9,7 @@ sources += files(
'eal_lcore.c',
'eal_log.c',
'eal_thread.c',
+ 'eal_timer.c',
'fnmatch.c',
'getopt.c',
)
--
2.16.1.windows.4
^ permalink raw reply [flat|nested] 5+ messages in thread