X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ring_perf.c;h=8c47ccb7e883fe81586d5c55996c981d7451e3e6;hb=7b21cadfd6c374dbf33128887875f5025a5ee28a;hp=5c369e9d20efd56da696ff24fae396662c1984ab;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git

diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index 5c369e9d20..8c47ccb7e8 100644
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -1,13 +1,13 @@
 /*-
  *   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
  *   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
@@ -17,7 +17,7 @@
  *     * 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
@@ -38,8 +38,6 @@
 #include <rte_cycles.h>
 #include <rte_launch.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
 /*
@@ -56,7 +54,7 @@
 #define RING_SIZE 4096
 #define MAX_BURST 32
 
-/* 
+/*
  * the sizes to enqueue and dequeue in testing
  * (marked volatile so they won't be seen as compile-time constants)
  */
@@ -168,7 +166,7 @@ test_empty_dequeue(void)
 			(double)(mc_end-mc_start) / iterations);
 }
 
-/* 
+/*
  * for the separate enqueue and dequeue threads they take in one param
  * and return two. Input = burst size, output = cycle average for sp/sc & mp/mc
  */
@@ -177,9 +175,9 @@ struct thread_params {
 	double spsc, mpmc;    /* output value, the single or multi timings */
 };
 
-/* 
+/*
  * Function that uses rdtsc to measure timing for ring enqueue. Needs pair
- * thread running dequeue_bulk function 
+ * thread running dequeue_bulk function
  */
 static int
 enqueue_bulk(void *p)
@@ -212,9 +210,9 @@ enqueue_bulk(void *p)
 	return 0;
 }
 
-/* 
+/*
  * Function that uses rdtsc to measure timing for ring dequeue. Needs pair
- * thread running enqueue_bulk function 
+ * thread running enqueue_bulk function
  */
 static int
 dequeue_bulk(void *p)
@@ -247,7 +245,7 @@ dequeue_bulk(void *p)
 	return 0;
 }
 
-/* 
+/*
  * Function that calls the enqueue and dequeue bulk functions on pairs of cores.
  * used to measure ring perf between hyperthreads, cores and sockets.
  */
@@ -255,7 +253,7 @@ static void
 run_on_core_pair(struct lcore_pair *cores,
 		lcore_function_t f1, lcore_function_t f2)
 {
-	struct thread_params param1 = {.size = 0}, param2 = {.size = 0};
+	struct thread_params param1 = {0}, param2 = {0};
 	unsigned i;
 	for (i = 0; i < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); i++) {
 		lcore_count = 0;
@@ -277,7 +275,7 @@ run_on_core_pair(struct lcore_pair *cores,
 	}
 }
 
-/* 
+/*
  * Test function that determines how long an enqueue + dequeue of a single item
  * takes on a single lcore. Result is for comparison with the bulk enq+deq.
  */
@@ -309,7 +307,7 @@ test_single_enqueue_dequeue(void)
 			(mc_end-mc_start) >> iter_shift);
 }
 
-/* 
+/*
  * Test that does both enqueue and dequeue on a core using the burst() API calls
  * instead of the bulk() calls used in other tests. Results should be the same
  * as for the bulk function called on a single lcore.
@@ -383,7 +381,7 @@ test_bulk_enqueue_dequeue(void)
 	}
 }
 
-int
+static int
 test_ring_perf(void)
 {
 	struct lcore_pair cores;
@@ -415,3 +413,9 @@ test_ring_perf(void)
 	}
 	return 0;
 }
+
+static struct test_command ring_perf_cmd = {
+	.command = "ring_perf_autotest",
+	.callback = test_ring_perf,
+};
+REGISTER_TEST_COMMAND(ring_perf_cmd);