From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 17/22] timer: get TSC frequency from /proc/cpuinfo
Date: Wed, 20 Mar 2013 17:05:05 +0100 [thread overview]
Message-ID: <b28a658c1e92ebdd7883555316d7af9a4b7a57df.1363795499.git.thomas.monjalon@6wind.com> (raw)
In-Reply-To: <cover.1363795499.git.thomas.monjalon@6wind.com>
In-Reply-To: <cover.1363795499.git.thomas.monjalon@6wind.com>
Frequency was guessed by sleeping 1 sec.
Now, read frequency from cpuinfo first.
Keep sleep method as fallback.
Acked-by: Ivan Boule <ivan.boule@6wind.com>
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
lib/librte_eal/linuxapp/eal/eal_hpet.c | 47 ++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_hpet.c b/lib/librte_eal/linuxapp/eal/eal_hpet.c
index de05151..d41e857 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hpet.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hpet.c
@@ -129,14 +129,51 @@ hpet_msb_inc(__attribute__((unused)) void *arg)
}
}
-static inline void
-set_rdtsc_freq(void)
+static uint64_t
+get_tsc_freq_from_cpuinfo(void)
{
- uint64_t start;
+ char line[256];
+ FILE *stream;
+ double dmhz;
+ uint64_t freq = 0;
+
+ stream = fopen("/proc/cpuinfo", "r");
+ if (!stream) {
+ RTE_LOG(WARNING, EAL, "WARNING: Unable to open /proc/cpuinfo\n");
+ return 0;
+ }
+
+ while (fgets(line, sizeof line, stream)) {
+ if (sscanf(line, "cpu MHz\t: %lf", &dmhz) == 1) {
+ freq = (uint64_t)(dmhz * 1000000UL);
+ break;
+ }
+ }
+
+ fclose(stream);
+ return freq;
+}
- start = rte_rdtsc();
+static uint64_t
+get_tsc_freq_from_sleep(void)
+{
+ uint64_t start = rte_rdtsc();
sleep(1);
- eal_hpet_resolution_hz = rte_rdtsc() - start;
+ return rte_rdtsc() - start;
+}
+
+static inline void
+set_rdtsc_freq(void)
+{
+ uint64_t freq;
+ freq = get_tsc_freq_from_cpuinfo();
+ if (!freq) {
+ RTE_LOG(WARNING, EAL, "WARNING: Cannot read CPU clock\n");
+ freq = get_tsc_freq_from_sleep();
+ }
+ RTE_LOG(INFO, EAL, "TSC clock @ %lu MHz\n",
+ (unsigned long) (freq / (1000000UL)));
+ eal_hpet_resolution_hz = freq;
eal_hpet_resolution_fs = (uint32_t)
((1.0 / eal_hpet_resolution_hz) / 1e-15);
}
--
1.7.2.5
next prev parent reply other threads:[~2013-03-20 16:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 16:04 [dpdk-dev] [PATCH 00/22] upgrade with 6WIND's enhancements Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 01/22] mk: use $CC to detect toolchain version Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 02/22] mk: fix typo in LDFLAGS for 32-bit Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 03/22] mk: fix verbose display of install command Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 04/22] mk: add a makefile for shared libraries Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 05/22] mk: allow corei7-avx flag with gcc 4.7 Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 06/22] app: fix volatile read for GCC >= 4.6 Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 07/22] app: fix unused values Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 08/22] app: use (void)variable when unused Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 09/22] app: fix testpmd compliance with __rte_mbuf_sanity_check() Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 10/22] app: fix config crash in testpmd Thomas Monjalon
2013-03-20 16:04 ` [dpdk-dev] [PATCH 11/22] app: fix autotest summary in error cases Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 12/22] lib: fix unused values Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 13/22] lib: fix uninitialized variables Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 14/22] lib: fix non-C99 macros definitions in exported headers Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 15/22] mem: fix access to huge page with high address Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 16/22] timer: check TSC reliability Thomas Monjalon
2013-03-20 16:05 ` Thomas Monjalon [this message]
2013-03-20 16:05 ` [dpdk-dev] [PATCH 18/22] timer: option --vmware-tsc-map for VMware guest Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 19/22] pci: reference driver structure for each device Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 20/22] pci: allow drivers to be bound several times to the same PCI device Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 21/22] igb_uio: fix driver dependency Thomas Monjalon
2013-03-20 16:05 ` [dpdk-dev] [PATCH 22/22] igb_uio: fix build with kernel >= 3.8 Thomas Monjalon
2013-03-20 16:58 ` [dpdk-dev] [PATCH 00/22] upgrade with 6WIND's enhancements Vincent JARDIN
2013-03-21 9:40 ` Thomas Monjalon
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=b28a658c1e92ebdd7883555316d7af9a4b7a57df.1363795499.git.thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
/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).