X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cycles.c;h=92d302bc51477595b79912b7da4627fbca30a063;hb=e987449c9fce2ec6210be3d8bad680d08d68c9dc;hp=f48040204d8327e0e385692a46456dac4d2990fd;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git

diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
index f48040204d..92d302bc51 100644
--- a/app/test/test_cycles.c
+++ b/app/test/test_cycles.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -30,7 +30,6 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- *  version: DPDK.L.1.2.3-3
  */
 
 #include <stdio.h>
@@ -49,7 +48,7 @@
  * Cycles test
  * ===========
  *
- * - Loop N times and check that the timer alway increments and
+ * - Loop N times and check that the timer always increments and
  *   never decrements during this loop.
  *
  * - Wait one second using rte_usleep() and check that the increment
@@ -61,14 +60,14 @@ test_cycles(void)
 {
 	unsigned i;
 	uint64_t start_cycles, cycles, prev_cycles;
-	uint64_t hz = rte_get_hpet_hz();
+	uint64_t hz = rte_get_timer_hz();
 	uint64_t max_inc = (hz / 100); /* 10 ms max between 2 reads */
 
 	/* check that the timer is always incrementing */
-	start_cycles = rte_get_hpet_cycles();
+	start_cycles = rte_get_timer_cycles();
 	prev_cycles = start_cycles;
 	for (i=0; i<N; i++) {
-		cycles = rte_get_hpet_cycles();
+		cycles = rte_get_timer_cycles();
 		if ((uint64_t)(cycles - prev_cycles) > max_inc) {
 			printf("increment too high or going backwards\n");
 			return -1;
@@ -77,16 +76,16 @@ test_cycles(void)
 	}
 
 	/* check that waiting 1 second is precise */
-	prev_cycles = rte_get_hpet_cycles();
+	prev_cycles = rte_get_timer_cycles();
 	rte_delay_us(1000000);
-	cycles = rte_get_hpet_cycles();
+	cycles = rte_get_timer_cycles();
+
 	if ((uint64_t)(cycles - prev_cycles) > (hz + max_inc)) {
-		printf("delay_us is not accurate\n");
+		printf("delay_us is not accurate: too long\n");
 		return -1;
 	}
-	cycles = rte_get_hpet_cycles();
-	if ((uint64_t)(cycles - prev_cycles) < (hz)) {
-		printf("delay_us is not accurate\n");
+	if ((uint64_t)(cycles - prev_cycles) < (hz - max_inc)) {
+		printf("delay_us is not accurate: too short\n");
 		return -1;
 	}