X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-crypto-perf%2Fcperf_test_latency.c;h=69f55de50adb161a2fb8ebe3f23f1a41372b1d4b;hb=db86bf263de8462345eaae7a5ab0d1c78c2be06c;hp=62478a2df51402074094254f7fdbb9c8280216cd;hpb=90e03347ca7d6d1a0e1b85d71d71ec5ae3b17a90;p=dpdk.git

diff --git a/app/test-crypto-perf/cperf_test_latency.c b/app/test-crypto-perf/cperf_test_latency.c
index 62478a2df5..69f55de50a 100644
--- a/app/test-crypto-perf/cperf_test_latency.c
+++ b/app/test-crypto-perf/cperf_test_latency.c
@@ -40,9 +40,6 @@ struct priv_op_data {
 	struct cperf_op_result *result;
 };
 
-#define max(a, b) (a > b ? (uint64_t)a : (uint64_t)b)
-#define min(a, b) (a < b ? (uint64_t)a : (uint64_t)b)
-
 static void
 cperf_latency_test_free(struct cperf_latency_ctx *ctx)
 {
@@ -203,7 +200,7 @@ cperf_latency_test_runner(void *arg)
 					ctx->dst_buf_offset,
 					burst_size, ctx->sess, ctx->options,
 					ctx->test_vector, iv_offset,
-					&imix_idx);
+					&imix_idx, NULL);
 
 			tsc_start = rte_rdtsc_precise();
 
@@ -254,13 +251,13 @@ cperf_latency_test_runner(void *arg)
 						(void **)ops_processed, ops_deqd);
 
 				deqd_tot += ops_deqd;
-				deqd_max = max(ops_deqd, deqd_max);
-				deqd_min = min(ops_deqd, deqd_min);
+				deqd_max = RTE_MAX(ops_deqd, deqd_max);
+				deqd_min = RTE_MIN(ops_deqd, deqd_min);
 			}
 
 			enqd_tot += ops_enqd;
-			enqd_max = max(ops_enqd, enqd_max);
-			enqd_min = min(ops_enqd, enqd_min);
+			enqd_max = RTE_MAX(ops_enqd, enqd_max);
+			enqd_min = RTE_MIN(ops_enqd, enqd_min);
 
 			b_idx++;
 		}
@@ -284,15 +281,15 @@ cperf_latency_test_runner(void *arg)
 						(void **)ops_processed, ops_deqd);
 
 				deqd_tot += ops_deqd;
-				deqd_max = max(ops_deqd, deqd_max);
-				deqd_min = min(ops_deqd, deqd_min);
+				deqd_max = RTE_MAX(ops_deqd, deqd_max);
+				deqd_min = RTE_MIN(ops_deqd, deqd_min);
 			}
 		}
 
 		for (i = 0; i < tsc_idx; i++) {
 			tsc_val = ctx->res[i].tsc_end - ctx->res[i].tsc_start;
-			tsc_max = max(tsc_val, tsc_max);
-			tsc_min = min(tsc_val, tsc_min);
+			tsc_max = RTE_MAX(tsc_val, tsc_max);
+			tsc_min = RTE_MIN(tsc_val, tsc_min);
 			tsc_tot += tsc_val;
 		}
 
@@ -313,11 +310,11 @@ cperf_latency_test_runner(void *arg)
 		if (ctx->options->csv) {
 			if (rte_atomic16_test_and_set(&display_once))
 				printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
-						"Packet Size, cycles, time (us)");
+						"cycles, time (us)");
 
 			for (i = 0; i < ctx->options->total_ops; i++) {
 
-				printf("\n%u;%u;%u;%"PRIu64";%"PRIu64";%.3f",
+				printf("\n%u,%u,%u,%"PRIu64",%"PRIu64",%.3f",
 					ctx->lcore_id, ctx->options->test_buffer_size,
 					test_burst_size, i + 1,
 					ctx->res[i].tsc_end - ctx->res[i].tsc_start,