Commit ff173863 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

ut/bdev: Remove duplication with many stups among unit test files 



Move all duplicated stubs in bdev.c, mt/bdev.c, and part.c unit test
files into the new file common_stubs.h in test/common/lib/bdev.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ic3d75821bf828e196fa576a18feae90d8bd2ffeb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25455


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Mellanox Build Bot
parent 658cb4c0

test/common/lib/bdev/common_stubs.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*   SPDX-License-Identifier: BSD-3-Clause

 *   Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 */



#include "spdk_internal/mock.h"



DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_memory_domain *domain),

	    "test_domain");

DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type,

	    (struct spdk_memory_domain *domain), 0);

DEFINE_STUB_V(spdk_accel_sequence_finish,

	      (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg));

DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq));

DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq));

DEFINE_STUB(spdk_accel_append_copy, int,

	    (struct spdk_accel_sequence **seq, struct spdk_io_channel *ch, struct iovec *dst_iovs,

	     uint32_t dst_iovcnt, struct spdk_memory_domain *dst_domain, void *dst_domain_ctx,

	     struct iovec *src_iovs, uint32_t src_iovcnt, struct spdk_memory_domain *src_domain,

	     void *src_domain_ctx, spdk_accel_step_cb cb_fn, void *cb_arg), 0);

DEFINE_STUB(spdk_accel_get_memory_domain, struct spdk_memory_domain *, (void), NULL);

test/unit/lib/bdev/bdev.c/bdev_ut.c

+1 −16
Original line number Diff line number Diff line
@@ -15,22 +15,7 @@ 


#include "bdev/bdev.c"



DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_memory_domain *domain),

	    "test_domain");

DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type,

	    (struct spdk_memory_domain *domain), 0);

DEFINE_STUB_V(spdk_accel_sequence_finish,

	      (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg));

DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq));

DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq));

DEFINE_STUB(spdk_accel_append_copy, int,

	    (struct spdk_accel_sequence **seq, struct spdk_io_channel *ch, struct iovec *dst_iovs,

	     uint32_t dst_iovcnt, struct spdk_memory_domain *dst_domain, void *dst_domain_ctx,

	     struct iovec *src_iovs, uint32_t src_iovcnt, struct spdk_memory_domain *src_domain,

	     void *src_domain_ctx, spdk_accel_step_cb cb_fn, void *cb_arg), 0);

DEFINE_STUB(spdk_accel_get_memory_domain, struct spdk_memory_domain *, (void), NULL);

#include "common/lib/bdev/common_stubs.h"



static bool g_memory_domain_pull_data_called;

static bool g_memory_domain_push_data_called;

test/unit/lib/bdev/mt/bdev.c/bdev_ut.c

+2 −19
Original line number Diff line number Diff line
@@ -15,26 +15,9 @@ 


#include "bdev/bdev.c"



#define BDEV_UT_NUM_THREADS 3

#include "common/lib/bdev/common_stubs.h"



DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

DEFINE_STUB_V(spdk_scsi_nvme_translate, (const struct spdk_bdev_io *bdev_io, int *sc, int *sk,

		int *asc, int *ascq));

DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_memory_domain *domain),

	    "test_domain");

DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type,

	    (struct spdk_memory_domain *domain), 0);

DEFINE_STUB_V(spdk_accel_sequence_finish,

	      (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg));

DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq));

DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq));

DEFINE_STUB(spdk_accel_append_copy, int,

	    (struct spdk_accel_sequence **seq, struct spdk_io_channel *ch, struct iovec *dst_iovs,

	     uint32_t dst_iovcnt, struct spdk_memory_domain *dst_domain, void *dst_domain_ctx,

	     struct iovec *src_iovs, uint32_t src_iovcnt, struct spdk_memory_domain *src_domain,

	     void *src_domain_ctx, spdk_accel_step_cb cb_fn, void *cb_arg), 0);

DEFINE_STUB(spdk_accel_get_memory_domain, struct spdk_memory_domain *, (void), NULL);

#define BDEV_UT_NUM_THREADS 3



DEFINE_RETURN_MOCK(spdk_memory_domain_pull_data, int);

int

test/unit/lib/bdev/part.c/part_ut.c

+2 −17
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include "bdev/bdev.c"

#include "bdev/part.c"



#include "common/lib/bdev/common_stubs.h"



struct ut_expected_io {

};
@@ -29,23 +31,6 @@ static uint32_t g_part_ut_io_device; 
static struct bdev_ut_channel *g_bdev_ut_channel;

static int g_accel_io_device;



DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);

DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);

DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_memory_domain *domain),

	    "test_domain");

DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type,

	    (struct spdk_memory_domain *domain), 0);

DEFINE_STUB_V(spdk_accel_sequence_finish,

	      (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg));

DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq));

DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq));

DEFINE_STUB(spdk_accel_append_copy, int,

	    (struct spdk_accel_sequence **seq, struct spdk_io_channel *ch, struct iovec *dst_iovs,

	     uint32_t dst_iovcnt, struct spdk_memory_domain *dst_domain, void *dst_domain_ctx,

	     struct iovec *src_iovs, uint32_t src_iovcnt, struct spdk_memory_domain *src_domain,

	     void *src_domain_ctx, spdk_accel_step_cb cb_fn, void *cb_arg), 0);

DEFINE_STUB(spdk_accel_get_memory_domain, struct spdk_memory_domain *, (void), NULL);



DEFINE_RETURN_MOCK(spdk_memory_domain_pull_data, int);

int

spdk_memory_domain_pull_data(struct spdk_memory_domain *src_domain, void *src_domain_ctx,