timer: prefer TSC to HPET

[dpdk.git] / app / test / test.c

diff --git a/app/test/test.c b/app/test/test.c
index 816c348..ee287b9 100644 (file)
--- a/app/test/test.c
+++ b/app/test/test.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 
@@ -52,10 +52,14 @@
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_timer.h>
+#include <rte_cycles.h>
+#include <rte_log.h>
 #include <rte_string_fns.h>
 
 #include "test.h"
 
+#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
+
 const char *prgname; /* to be set to argv[0] */
 
 #ifndef RTE_EXEC_ENV_BAREMETAL
@@ -94,34 +98,6 @@ do_recursive_call(void)
 }
 #endif
 
-void
-test_hexdump(const char *title, const void *buf, unsigned int len)
-{
-       unsigned int i, out, ofs;
-       const unsigned char *data = buf;
-#define LINE_LEN 80
-       char line[LINE_LEN];    /* space needed 8+16*3+3+16 == 75 */
-
-       printf("%s at [%p], len=%u\n", title, data, len);
-       ofs = 0;
-       while (ofs < len) {
-               /* format 1 line in the buffer, then use printf to print them */
-               out = rte_snprintf(line, LINE_LEN, "%08X", ofs);
-               for (i = 0; ofs+i < len && i < 16; i++)
-                       out += rte_snprintf(line+out, LINE_LEN - out, " %02X",
-                                       data[ofs+i]&0xff);
-               for(; i <= 16; i++)
-                       out += rte_snprintf(line+out, LINE_LEN - out, "   ");
-               for(i = 0; ofs < len && i < 16; i++, ofs++) {
-                       unsigned char c = data[ofs];
-                       if (!isascii(c) || !isprint(c))
-                               c = '.';
-                       out += rte_snprintf(line+out, LINE_LEN - out, "%c", c);
-               }
-               printf("%s\n", line);
-       }
-}
-
 int
 main(int argc, char **argv)
 {
@@ -143,6 +119,14 @@ main(int argc, char **argv)
                return do_recursive_call();
 #endif
 
+#ifdef RTE_LIBEAL_USE_HPET
+       if (rte_eal_hpet_init(1) < 0)
+#endif
+               RTE_LOG(INFO, APP,
+                               "HPET is not enabled, using TSC as default timer\n");
+
+
+
        cl = cmdline_stdin_new(main_ctx, "RTE>>");
        if (cl == NULL) {
                return -1;