X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-compress-perf%2Fcomp_perf_options.h;h=2c26511ef0adf2a34c95e79c3bdb4d1aa11118d7;hb=4a83876faeb6d9e7e19e3b9ee212e55b8d637c3d;hp=0aa29a599bc240045bff33f11efd85a683166387;hpb=424dd6c8c1a86fbc73c3e8f739bafa0324640ca8;p=dpdk.git

diff --git a/app/test-compress-perf/comp_perf_options.h b/app/test-compress-perf/comp_perf_options.h
index 0aa29a599b..2c26511ef0 100644
--- a/app/test-compress-perf/comp_perf_options.h
+++ b/app/test-compress-perf/comp_perf_options.h
@@ -5,15 +5,13 @@
 #ifndef _COMP_PERF_OPS_
 #define _COMP_PERF_OPS_
 
-#define MAX_DRIVER_NAME		64
-#define MAX_INPUT_FILE_NAME	64
 #define MAX_LIST		32
 #define MIN_COMPRESSED_BUF_SIZE 8
-#define EXPANSE_RATIO 1.05
+#define EXPANSE_RATIO 1.1
 #define MAX_MBUF_DATA_SIZE (UINT16_MAX - RTE_PKTMBUF_HEADROOM)
 #define MAX_SEG_SIZE ((int)(MAX_MBUF_DATA_SIZE / EXPANSE_RATIO))
 
-extern const char *cperf_test_type_strs[];
+extern const char *comp_perf_test_type_strs[];
 
 /* Cleanup state machine */
 enum cleanup_st {
@@ -25,7 +23,7 @@ enum cleanup_st {
 	ST_DURING_TEST
 };
 
-enum cperf_perf_test_type {
+enum cperf_test_type {
 	CPERF_TEST_TYPE_BENCHMARK,
 	CPERF_TEST_TYPE_VERIFY
 };
@@ -45,9 +43,9 @@ struct range_list {
 };
 
 struct comp_test_data {
-	char driver_name[64];
-	char input_file[64];
-	enum cperf_perf_test_type test;
+	char driver_name[RTE_DEV_NAME_MAX_LEN];
+	char input_file[PATH_MAX];
+	enum cperf_test_type test;
 
 	uint8_t *input_data;
 	size_t input_data_sz;
@@ -58,15 +56,18 @@ struct comp_test_data {
 	uint32_t pool_sz;
 	uint32_t num_iter;
 	uint16_t max_sgl_segs;
+	uint32_t total_segs;
 
 	enum rte_comp_huffman huffman_enc;
 	enum comp_operation test_op;
 	int window_sz;
 	struct range_list level_lst;
 	uint8_t level;
+	int use_external_mbufs;
 
 	double ratio;
 	enum cleanup_st cleanup;
+	int perf_comp_force_stop;
 };
 
 int