From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, talshn@mellanox.com, fady@mellanox.com,
dmitry.koziuk@gmail.com, harini.ramakrishnan@microsoft.com,
ocardona@microsoft.com, anand.rawat@intel.com,
ranjit.menon@intel.com
Subject: [dpdk-dev] [PATCH v2 1/2] timer: move from common to Unix directory
Date: Mon, 27 Apr 2020 15:20:46 +0300 [thread overview]
Message-ID: <20200427122047.16780-2-fady@mellanox.com> (raw)
In-Reply-To: <20200427122047.16780-1-fady@mellanox.com>
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 | 1 +
3 files changed, 30 insertions(+), 22 deletions(-)
create mode 100644 lib/librte_eal/unix/eal_timer.c
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..36189c346
--- /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
index 50c019a56..9da601658 100644
--- a/lib/librte_eal/unix/meson.build
+++ b/lib/librte_eal/unix/meson.build
@@ -4,4 +4,5 @@
sources += files(
'eal.c',
'eal_memory.c',
+ 'eal_timer.c',
)
--
2.16.1.windows.4
next prev parent reply other threads:[~2020-04-27 12:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 12:20 [dpdk-dev] [PATCH v2 0/2] eal timer split and implementation for Windows Fady Bader
2020-04-27 12:20 ` Fady Bader [this message]
2020-04-27 12:20 ` [dpdk-dev] [PATCH v2 2/2] timer: support EAL functions on Windows Fady Bader
2020-04-27 19:34 ` 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=20200427122047.16780-2-fady@mellanox.com \
--to=fady@mellanox.com \
--cc=anand.rawat@intel.com \
--cc=dev@dpdk.org \
--cc=dmitry.koziuk@gmail.com \
--cc=harini.ramakrishnan@microsoft.com \
--cc=ocardona@microsoft.com \
--cc=ranjit.menon@intel.com \
--cc=talshn@mellanox.com \
--cc=thomas@monjalon.net \
/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).