import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / lib / librte_eal / common / eal_common_timer.c

diff --git a/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_timer.c b/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_timer.c
index 2e2b770fb90632a1c3156464de8defdaea189a25..68d67e684be6e03a55bca12cd2e1a74a3e07a10a 100644 (file)
--- a/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_timer.c
+++ b/ceph/src/spdk/dpdk/lib/librte_eal/common/eal_common_timer.c
@@ -7,9 +7,11 @@
 #include <unistd.h>
 #include <inttypes.h>
 #include <sys/types.h>
+#include <time.h>
 #include <errno.h>
 
 #include <rte_common.h>
+#include <rte_compat.h>
 #include <rte_log.h>
 #include <rte_cycles.h>
 #include <rte_pause.h>
@@ -31,6 +33,28 @@ rte_delay_us_block(unsigned int us)
                rte_pause();
 }
 
+void __rte_experimental
+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)
 {
@@ -40,12 +64,14 @@ rte_get_tsc_hz(void)
 static uint64_t
 estimate_tsc_freq(void)
 {
+#define CYC_PER_10MHZ 1E7
        RTE_LOG(WARNING, EAL, "WARNING: TSC frequency estimated roughly"
                " - clock timings may be less accurate.\n");
        /* assume that the sleep(1) will sleep for 1 second */
        uint64_t start = rte_rdtsc();
        sleep(1);
-       return rte_rdtsc() - start;
+       /* Round up to 10Mhz. 1E7 ~ 10Mhz */
+       return RTE_ALIGN_MUL_NEAR(rte_rdtsc() - start, CYC_PER_10MHZ);
 }
 
 void