X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-compress-perf%2Fcomp_perf_options_parse.c;h=2fb6fb48a51d823ab0554ae73eec3d92931476e4;hb=339b88c6a91f84bca1a35d53a2d1bee551b4ceb5;hp=add5c8a00af256ed1b9bfd3ab359e55c53301d42;hpb=b68a82425da450b6846febe9995318599c42e592;p=dpdk.git

diff --git a/app/test-compress-perf/comp_perf_options_parse.c b/app/test-compress-perf/comp_perf_options_parse.c
index add5c8a00a..2fb6fb48a5 100644
--- a/app/test-compress-perf/comp_perf_options_parse.c
+++ b/app/test-compress-perf/comp_perf_options_parse.c
@@ -50,8 +50,8 @@ usage(char *progname)
 		"		compressed/decompressed (default: 10000)\n"
 		" --operation [comp/decomp/comp_and_decomp]: perform test on\n"
 		"		compression, decompression or both operations\n"
-		" --huffman-enc [fixed/default]: Huffman encoding\n"
-		"		(default: fixed)\n"
+		" --huffman-enc [fixed/dynamic/default]: Huffman encoding\n"
+		"		(default: dynamic)\n"
 		" --compress-level N: compression level, which could be a single value, list or range\n"
 		"		(default: range between 1 and 9)\n"
 		" --window-sz N: base two log value of compression window size\n"
@@ -326,8 +326,15 @@ parse_seg_sz(struct comp_test_data *test_data, const char *arg)
 		return -1;
 	}
 
-	if (test_data->seg_sz == 0) {
-		RTE_LOG(ERR, USER1, "Segment size must be higher than 0\n");
+	if (test_data->seg_sz < MIN_COMPRESSED_BUF_SIZE) {
+		RTE_LOG(ERR, USER1, "Segment size must be higher than %d\n",
+			MIN_COMPRESSED_BUF_SIZE - 1);
+		return -1;
+	}
+
+	if (test_data->seg_sz > MAX_SEG_SIZE) {
+		RTE_LOG(ERR, USER1, "Segment size must be lower than %d\n",
+			MAX_SEG_SIZE + 1);
 		return -1;
 	}
 
@@ -373,7 +380,7 @@ parse_driver_name(struct comp_test_data *test_data, const char *arg)
 	if (strlen(arg) > (sizeof(test_data->driver_name) - 1))
 		return -1;
 
-	rte_strlcpy(test_data->driver_name, arg,
+	strlcpy(test_data->driver_name, arg,
 			sizeof(test_data->driver_name));
 
 	return 0;
@@ -385,7 +392,7 @@ parse_test_file(struct comp_test_data *test_data, const char *arg)
 	if (strlen(arg) > (sizeof(test_data->input_file) - 1))
 		return -1;
 
-	rte_strlcpy(test_data->input_file, arg, sizeof(test_data->input_file));
+	strlcpy(test_data->input_file, arg, sizeof(test_data->input_file));
 
 	return 0;
 }
@@ -431,6 +438,10 @@ parse_huffman_enc(struct comp_test_data *test_data, const char *arg)
 		{
 			"fixed",
 			RTE_COMP_HUFFMAN_FIXED
+		},
+		{
+			"dynamic",
+			RTE_COMP_HUFFMAN_DYNAMIC
 		}
 	};
 
@@ -567,7 +578,7 @@ comp_perf_options_default(struct comp_test_data *test_data)
 	test_data->pool_sz = 8192;
 	test_data->max_sgl_segs = 16;
 	test_data->num_iter = 10000;
-	test_data->huffman_enc = RTE_COMP_HUFFMAN_FIXED;
+	test_data->huffman_enc = RTE_COMP_HUFFMAN_DYNAMIC;
 	test_data->test_op = COMPRESS_DECOMPRESS;
 	test_data->window_sz = -1;
 	test_data->level.min = 1;