X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_red.c;h=e973f3131e66c8fe2db1661dabf4f1ba431adbef;hb=95e0f23022a36d5d66957af3da7f2925b44a9a80;hp=2384c5569d72d4246dfb2eb6af7087bc02d2c520;hpb=517b81d164ee0fc8b68ca9e055308ecc2e47088b;p=dpdk.git

diff --git a/app/test/test_red.c b/app/test/test_red.c
index 2384c5569d..e973f3131e 100644
--- a/app/test/test_red.c
+++ b/app/test/test_red.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   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
- *   are met:
- *
- *     * 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
- *       distribution.
- *     * 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
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdlib.h>
@@ -273,46 +244,6 @@ static int check_avg(double *diff, double avg, double exp_avg, double tolerance)
 	return ret;
 }
 
-/**
- * get the clk frequency in Hz
- */
-static uint64_t get_machclk_freq(void)
-{
-	uint64_t start = 0;
-	uint64_t end = 0;
-	uint64_t diff = 0;
-	static uint64_t clk_freq_hz;
-	struct timespec tv_start = {0, 0}, tv_end = {0, 0};
-	struct timespec req = {0, 0};
-
-	if (clk_freq_hz != 0)
-		return clk_freq_hz;
-
-	req.tv_sec = 0;
-	req.tv_nsec = NSEC_PER_SEC / 4;
-
-	clock_gettime(CLOCK_REALTIME, &tv_start);
-	start = rte_rdtsc();
-
-	if (nanosleep(&req, NULL) != 0) {
-		perror("get_machclk_freq()");
-		exit(EXIT_FAILURE);
-	}
-
-	clock_gettime(CLOCK_REALTIME, &tv_end);
-	end = rte_rdtsc();
-
-	diff = (uint64_t)(tv_end.tv_sec - tv_start.tv_sec) * USEC_PER_SEC
-		+ ((tv_end.tv_nsec - tv_start.tv_nsec + TEST_NSEC_MARGIN) /
-		   USEC_PER_MSEC); /**< diff is in micro secs */
-
-	if (diff == 0)
-		return 0;
-
-	clk_freq_hz = ((end - start) * USEC_PER_SEC / diff);
-	return clk_freq_hz;
-}
-
 /**
  * initialize the test rte_red config
  */
@@ -321,7 +252,7 @@ test_rte_red_init(struct test_config *tcfg)
 {
 	unsigned i = 0;
 
-	tcfg->tvar->clk_freq = get_machclk_freq();
+	tcfg->tvar->clk_freq = rte_get_timer_hz();
 	init_port_ts( tcfg->tvar->clk_freq );
 
 	for (i = 0; i < tcfg->tconfig->num_cfg; i++) {
@@ -1920,20 +1851,6 @@ test_red_all(void)
 	return tell_the_result(num_tests, num_pass);
 }
 
-static struct test_command red_cmd = {
-	.command = "red_autotest",
-	.callback = test_red,
-};
-REGISTER_TEST_COMMAND(red_cmd);
-
-static struct test_command red_cmd_perf = {
-	.command = "red_perf",
-	.callback = test_red_perf,
-};
-REGISTER_TEST_COMMAND(red_cmd_perf);
-
-static struct test_command red_cmd_all = {
-	.command = "red_all",
-	.callback = test_red_all,
-};
-REGISTER_TEST_COMMAND(red_cmd_all);
+REGISTER_TEST_COMMAND(red_autotest, test_red);
+REGISTER_TEST_COMMAND(red_perf, test_red_perf);
+REGISTER_TEST_COMMAND(red_all, test_red_all);