Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-16.11-stable' into 16.11.x
[deb_dpdk.git]
/
app
/
test
/
test_mempool.c
diff --git
a/app/test/test_mempool.c
b/app/test/test_mempool.c
index
715b250
..
8fb13ce
100644
(file)
--- a/
app/test/test_mempool.c
+++ b/
app/test/test_mempool.c
@@
-356,17
+356,17
@@
test_mempool_sp_sc(void)
}
if (rte_mempool_lookup("test_mempool_sp_sc") != mp_spsc) {
printf("Cannot lookup mempool from its name\n");
}
if (rte_mempool_lookup("test_mempool_sp_sc") != mp_spsc) {
printf("Cannot lookup mempool from its name\n");
- r
te_mempool_free(mp_spsc)
;
-
RET_ERR()
;
+ r
et = -1
;
+
goto err
;
}
lcore_next = rte_get_next_lcore(lcore_id, 0, 1);
if (lcore_next >= RTE_MAX_LCORE) {
}
lcore_next = rte_get_next_lcore(lcore_id, 0, 1);
if (lcore_next >= RTE_MAX_LCORE) {
- r
te_mempool_free(mp_spsc)
;
-
RET_ERR()
;
+ r
et = -1
;
+
goto err
;
}
if (rte_eal_lcore_role(lcore_next) != ROLE_RTE) {
}
if (rte_eal_lcore_role(lcore_next) != ROLE_RTE) {
- r
te_mempool_free(mp_spsc)
;
-
RET_ERR()
;
+ r
et = -1
;
+
goto err
;
}
rte_spinlock_init(&scsp_spinlock);
memset(scsp_obj_table, 0, sizeof(scsp_obj_table));
}
rte_spinlock_init(&scsp_spinlock);
memset(scsp_obj_table, 0, sizeof(scsp_obj_table));
@@
-377,7
+377,10
@@
test_mempool_sp_sc(void)
if (rte_eal_wait_lcore(lcore_next) < 0)
ret = -1;
if (rte_eal_wait_lcore(lcore_next) < 0)
ret = -1;
+
+err:
rte_mempool_free(mp_spsc);
rte_mempool_free(mp_spsc);
+ mp_spsc = NULL;
return ret;
}
return ret;
}