add FILE argument to debug functions

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

diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index bb01cb0..2f6c660 100644 (file)
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
  * 
- *     * Redistributions of source code must retain the above copyright 
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
  * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <string.h>
@@ -59,8 +58,6 @@
 #include <rte_spinlock.h>
 #include <rte_malloc.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*
@@ -140,7 +137,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg)
        unsigned lcore_id = rte_lcore_id();
        int ret;
        uint64_t start_cycles, end_cycles;
-       uint64_t time_diff = 0, hz = rte_get_hpet_hz();
+       uint64_t time_diff = 0, hz = rte_get_timer_hz();
 
        /* n_get_bulk and n_put_bulk must be divisors of n_keep */
        if (((n_keep / n_get_bulk) * n_get_bulk) != n_keep)
@@ -154,7 +151,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg)
        if (lcore_id != rte_get_master_lcore())
                while (rte_atomic32_read(&synchro) == 0);
 
-       start_cycles = rte_get_hpet_cycles();
+       start_cycles = rte_get_timer_cycles();
 
        while (time_diff/hz < TIME_S) {
                for (i = 0; likely(i < (N/n_keep)); i++) {
@@ -164,8 +161,8 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg)
                                ret = rte_mempool_get_bulk(mp, &obj_table[idx],
                                                           n_get_bulk);
                                if (unlikely(ret < 0)) {
-                                       rte_mempool_dump(mp);
-                                       rte_ring_dump(mp->ring);
+                                       rte_mempool_dump(stdout, mp);
+                                       rte_ring_dump(stdout, mp->ring);
                                        /* in this case, objects are lost... */
                                        return -1;
                                }
@@ -180,7 +177,7 @@ per_lcore_mempool_test(__attribute__((unused)) void *arg)
                                idx += n_put_bulk;
                        }
                }
-               end_cycles = rte_get_hpet_cycles();
+               end_cycles = rte_get_timer_cycles();
                time_diff = end_cycles - start_cycles;
                stats[lcore_id].enq_count += N;
        }
@@ -328,7 +325,7 @@ test_mempool_perf(void)
        if (do_one_mempool_test(rte_lcore_count()) < 0)
                return -1;
 
-       rte_mempool_list_dump();
+       rte_mempool_list_dump(stdout);
 
        return 0;
 }