[dpdk-dev] [PATCH] app/test: fix failing packet-framework table unit-tests

[Dumitrescu, Cristian]

> -Original Message-
> From: Singh, Jasvinder
> Sent: Monday, September 12, 2016 12:06 PM
> To: dev at dpdk.org
> Cc: Dumitrescu, Cristian 
> Subject: [PATCH] app/test: fix failing packet-framework table unit-tests
> 
> The pipeline object is not freed when a particular test-case of the unit-test
> finishes. Using rte_pipeline_free() before returning the outcome for each
> test-case fixes the issue.
> 
> Fixes: 5205954791cb ("app/test: packet framework unit tests")
> 
> Signed-off-by: Jasvinder Singh 
> ---

Acked-by: Cristian Dumitrescu 

[dpdk-dev] [PATCH] app/test: fix failing packet-framework table unit-tests

[Jasvinder Singh]

The pipeline object is not freed when a particular test-case of the unit-test
finishes. Using rte_pipeline_free() before returning the outcome for each
test-case fixes the issue.

Fixes: 5205954791cb ("app/test: packet framework unit tests")

Signed-off-by: Jasvinder Singh 
---
 app/test/test_table_combined.c | 45 +++---
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/test/test_table_combined.c b/app/test/test_table_combined.c
index acb4f4d..8724afa 100644
--- a/app/test/test_table_combined.c
+++ b/app/test/test_table_combined.c
@@ -110,8 +110,10 @@ test_table_type(struct rte_table_ops *table_ops, void 
*table_args,
};

if (rte_pipeline_port_in_create(pipeline, _in_params,
-   _in_id) != 0)
+   _in_id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_PORT_CONFIG;
+   }

/* Create table */
struct rte_pipeline_table_params table_params = {
@@ -123,8 +125,11 @@ test_table_type(struct rte_table_ops *table_ops, void 
*table_args,
.action_data_size = 0,
};

-   if (rte_pipeline_table_create(pipeline, _params, _id) != 0)
+   if (rte_pipeline_table_create(pipeline, _params,
+   _id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_TABLE_CONFIG;
+   }

/* Create output ports */
ring_params_tx.ring = RING_TX;
@@ -136,14 +141,18 @@ test_table_type(struct rte_table_ops *table_ops, void 
*table_args,
};

if (rte_pipeline_port_out_create(pipeline, _out_params,
-   _out_id) != 0)
+   _out_id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_PORT_CONFIG;
+   }

ring_params_tx.ring = RING_TX_2;

if (rte_pipeline_port_out_create(pipeline, _out_params,
-   _out_2_id) != 0)
+   _out_2_id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_PORT_CONFIG;
+   }

/* Add entry to the table */
struct rte_pipeline_table_entry default_entry = {
@@ -161,24 +170,34 @@ test_table_type(struct rte_table_ops *table_ops, void 
*table_args,
int key_found;

if (rte_pipeline_table_default_entry_add(pipeline, table_id,
-   _entry, _entry_ptr) != 0)
+   _entry, _entry_ptr) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_DEFAULT_ENTRY_ADD;
+   }

if (rte_pipeline_table_entry_add(pipeline, table_id,
key ? key : _entry, _entry, _found,
-   _ptr) != 0)
+   _ptr) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_ENTRY_ADD;
+   }

/* Create connections and check consistency */
if (rte_pipeline_port_in_connect_to_table(pipeline, ring_in_id,
-   table_id) != 0)
+   table_id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_CONNECT;
+   }

-   if (rte_pipeline_port_in_enable(pipeline, ring_in_id) != 0)
+   if (rte_pipeline_port_in_enable(pipeline, ring_in_id) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_PORT_ENABLE;
+   }

-   if (rte_pipeline_check(pipeline) != 0)
+   if (rte_pipeline_check(pipeline) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_CONSISTENCY;
+   }



@@ -234,13 +253,17 @@ test_table_type(struct rte_table_ops *table_ops, void 
*table_args,
table_entry.table_id = ring_out_2_id;

if (rte_pipeline_table_default_entry_add(pipeline, table_id,
-   _entry, _entry_ptr) != 0)
+   _entry, _entry_ptr) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_ENTRY_ADD;
+   }

if (rte_pipeline_table_entry_add(pipeline, table_id,
key ? key : _entry, _entry, _found,
-   _ptr) != 0)
+   _ptr) != 0) {
+   rte_pipeline_free(pipeline);
return -CHECK_TABLE_ENTRY_ADD;
+   }

/* Check that traffic destination has changed */
if (table_packets->n_hit_packets) {
-- 
2.5.5