ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ut/compress: introduce #define for better readability

Browse Source 
To make next patch in this series clearer

Change-Id: I6654a92309b4b98351e3793439ecff1b10a24863
Signed-off-by: paul luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467287
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
paul luse 2019-09-03 16:00:27 -04:00 committed by Jim Harris
parent 7f6fdcffb8
commit e261a95c5b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/unit/lib/bdev/compress.c/compress_ut.c
View File

@ -41,6 +41,12 @@
#include <rte_compressdev.h> #include <rte_compressdev.h>
/* There will be one if the data perfectly matches the chunk size,
* or there could be an offset into the data and a remainder after
* the data or both for a max of 3.
*/
#define UT_MBUFS_PER_OP 3
struct spdk_bdev_io *g_bdev_io; struct spdk_bdev_io *g_bdev_io;
struct spdk_io_channel *g_io_ch; struct spdk_io_channel *g_io_ch;
struct rte_comp_op g_comp_op[2]; struct rte_comp_op g_comp_op[2];
@ -48,10 +54,10 @@ struct vbdev_compress g_comp_bdev;
struct comp_device_qp g_device_qp; struct comp_device_qp g_device_qp;
struct compress_dev g_device; struct compress_dev g_device;
struct rte_compressdev_capabilities g_cdev_cap; struct rte_compressdev_capabilities g_cdev_cap;
static struct rte_mbuf *g_src_mbufs[3]; static struct rte_mbuf *g_src_mbufs[UT_MBUFS_PER_OP];
static struct rte_mbuf *g_dst_mbufs[3]; static struct rte_mbuf *g_dst_mbufs[UT_MBUFS_PER_OP];
static struct rte_mbuf g_expected_src_mbufs[3]; static struct rte_mbuf g_expected_src_mbufs[UT_MBUFS_PER_OP];
static struct rte_mbuf g_expected_dst_mbufs[3]; static struct rte_mbuf g_expected_dst_mbufs[UT_MBUFS_PER_OP];
struct comp_bdev_io *g_io_ctx; struct comp_bdev_io *g_io_ctx;
struct comp_io_channel *g_comp_ch; struct comp_io_channel *g_comp_ch;
struct rte_config *g_test_config; struct rte_config *g_test_config;
@ -186,19 +192,21 @@ int mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbuf
/* This mocked function only supports the alloc of up to 3 src and 3 dst. */ /* This mocked function only supports the alloc of up to 3 src and 3 dst. */
ut_rte_pktmbuf_alloc_bulk += count; ut_rte_pktmbuf_alloc_bulk += count;
for (i = 0; i < 3; i++) { for (i = 0; i < UT_MBUFS_PER_OP; i++) {
g_src_mbufs[i]->next = NULL; g_src_mbufs[i]->next = NULL;
g_dst_mbufs[i]->next = NULL; g_dst_mbufs[i]->next = NULL;
} }
if (ut_rte_pktmbuf_alloc_bulk == 3) { if (ut_rte_pktmbuf_alloc_bulk == UT_MBUFS_PER_OP) {
*mbufs++ = g_src_mbufs[0]; /* first test allocation */
*mbufs++ = g_src_mbufs[1]; for (i = 0; i < UT_MBUFS_PER_OP; i++) {
*mbufs = g_src_mbufs[2]; *mbufs++ = g_src_mbufs[i];
} else if (ut_rte_pktmbuf_alloc_bulk == 6) { }
*mbufs++ = g_dst_mbufs[0]; } else if (ut_rte_pktmbuf_alloc_bulk == UT_MBUFS_PER_OP * 2) {
*mbufs++ = g_dst_mbufs[1]; /* second test allocation */
*mbufs = g_dst_mbufs[2]; for (i = 0; i < UT_MBUFS_PER_OP; i++) {
*mbufs++ = g_dst_mbufs[i];
}
ut_rte_pktmbuf_alloc_bulk = 0; ut_rte_pktmbuf_alloc_bulk = 0;
} else { } else {
return -1; return -1;
@ -630,7 +638,7 @@ test_poller(void)
{ {
int rc; int rc;
struct spdk_reduce_vol_cb_args *cb_args; struct spdk_reduce_vol_cb_args *cb_args;
struct rte_mbuf mbuf[4]; struct rte_mbuf mbuf[4]; /* one src, one dst, 2 ops */
struct vbdev_comp_op *op_to_queue; struct vbdev_comp_op *op_to_queue;
struct iovec src_iovs[3] = {}; struct iovec src_iovs[3] = {};
struct iovec dst_iovs[3] = {}; struct iovec dst_iovs[3] = {};