DPDK patches and discussions
 help / color / mirror / Atom feed
From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, talshn@mellanox.com,
	dmitry.koziuk@gmail.com, yohadt@mellanox.com,
	harini.ramakrishnan@microsoft.com, ocardona@microsoft.com,
	anand.rawat@intel.com, ranjit.menon@intel.com
Subject: [dpdk-dev] [PATCH v5 3/3] timer: support EAL functions on Windows
Date: Thu,  7 May 2020 16:05:31 +0300	[thread overview]
Message-ID: <20200507130531.624-4-fady@mellanox.com> (raw)
In-Reply-To: <20200507130531.624-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      | 77 +++++++++++++++++++++++++++++++++
 lib/librte_eal/windows/include/rte_os.h |  2 +
 lib/librte_eal/windows/meson.build      |  1 +
 5 files changed, 87 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 831179799..4bc8fbfab 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -248,6 +248,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..2d2929fb3
--- /dev/null
+++ b/lib/librte_eal/windows/eal_timer.c
@@ -0,0 +1,77 @@
+/* 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)
+{
+	LARGE_INTEGER start, end;
+	LARGE_INTEGER freq;
+
+	QueryPerformanceCounter(&start);
+	QueryPerformanceFrequency(&freq);
+
+	LARGE_INTEGER ticks;
+	ticks.QuadPart = freq.QuadPart * us / US_PER_SEC;
+
+	QueryPerformanceCounter(&end);
+	while ((end.QuadPart - start.QuadPart) < ticks.QuadPart) {
+		rte_pause();
+		QueryPerformanceCounter(&end);
+	}
+}
+
+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 09dd4ab2f..c796f289d 100644
--- a/lib/librte_eal/windows/meson.build
+++ b/lib/librte_eal/windows/meson.build
@@ -8,5 +8,6 @@ sources += files(
 	'eal_debug.c',
 	'eal_lcore.c',
 	'eal_thread.c',
+	'eal_timer.c',
 	'getopt.c',
 )
-- 
2.16.1.windows.4


  parent reply	other threads:[~2020-05-07 13:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-07 13:05 [dpdk-dev] [PATCH v5 0/3] eal timer split and implementation for Windows Fady Bader
2020-05-07 13:05 ` [dpdk-dev] [PATCH v5 1/3] timer: move from common to Unix directory Fady Bader
2020-05-07 13:05 ` [dpdk-dev] [PATCH v5 2/3] eal: proc type function for Windows Fady Bader
2020-05-07 13:05 ` Fady Bader [this message]
2020-05-07 20:54   ` [dpdk-dev] [PATCH v5 3/3] timer: support EAL functions on Windows 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=20200507130531.624-4-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 \
    --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).