New upstream version 18.11-rc1

[deb_dpdk.git] / test / test / test_cycles.c

diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c
index 149f60b..c78e6a5 100644 (file)
--- a/test/test/test_cycles.c
+++ b/test/test/test_cycles.c
@@ -23,6 +23,30 @@
  *   of cycles is correct with regard to the frequency of the timer.
  */
 
+static int
+check_wait_one_second(void)
+{
+       uint64_t cycles, prev_cycles;
+       uint64_t hz = rte_get_timer_hz();
+       uint64_t max_inc = (hz / 100); /* 10 ms max between 2 reads */
+
+       /* check that waiting 1 second is precise */
+       prev_cycles = rte_get_timer_cycles();
+       rte_delay_us(1000000);
+       cycles = rte_get_timer_cycles();
+
+       if ((uint64_t)(cycles - prev_cycles) > (hz + max_inc)) {
+               printf("delay_us is not accurate: too long\n");
+               return -1;
+       }
+       if ((uint64_t)(cycles - prev_cycles) < (hz - max_inc)) {
+               printf("delay_us is not accurate: too short\n");
+               return -1;
+       }
+
+       return 0;
+}
+
 static int
 test_cycles(void)
 {
@@ -43,24 +67,23 @@ test_cycles(void)
                prev_cycles = cycles;
        }
 
-       /* check that waiting 1 second is precise */
-       prev_cycles = rte_get_timer_cycles();
-       rte_delay_us(1000000);
-       cycles = rte_get_timer_cycles();
+       return check_wait_one_second();
+}
 
-       if ((uint64_t)(cycles - prev_cycles) > (hz + max_inc)) {
-               printf("delay_us is not accurate: too long\n");
-               return -1;
-       }
-       if ((uint64_t)(cycles - prev_cycles) < (hz - max_inc)) {
-               printf("delay_us is not accurate: too short\n");
-               return -1;
-       }
+REGISTER_TEST_COMMAND(cycles_autotest, test_cycles);
 
-       return 0;
+/*
+ * One second precision test with rte_delay_us_sleep.
+ */
+
+static int
+test_delay_us_sleep(void)
+{
+       rte_delay_us_callback_register(rte_delay_us_sleep);
+       return check_wait_one_second();
 }
 
-REGISTER_TEST_COMMAND(cycles_autotest, test_cycles);
+REGISTER_TEST_COMMAND(delay_us_sleep_autotest, test_delay_us_sleep);
 
 /*
  * rte_delay_us_callback test