From 42ec403b6a95f94be8ef7a5e635d05c4fb95d310 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 23 Oct 2020 18:01:14 +0000 Subject: [PATCH] test: add some missing stubs This fixes link issues with clang on some systems. Fixes another part of issue #1613. Signed-off-by: Jim Harris Change-Id: Icd51351b8e38043f267918b85e8ed1c3daab2db7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4860 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- test/common/lib/test_env.c | 5 +++++ test/env/memory/memory_ut.c | 5 +++++ test/nvme/cuse/cuse.c | 6 ++++++ test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c | 3 +++ test/unit/lib/bdev/compress.c/compress_ut.c | 6 ++++++ test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 2 ++ test/unit/lib/event/app.c/app_ut.c | 5 +++++ 7 files changed, 32 insertions(+) diff --git a/test/common/lib/test_env.c b/test/common/lib/test_env.c index 790039554..02af5b465 100644 --- a/test/common/lib/test_env.c +++ b/test/common/lib/test_env.c @@ -52,6 +52,11 @@ DEFINE_STUB_V(spdk_pci_driver_register, (const char *name, struct spdk_pci_id *i DEFINE_STUB(spdk_pci_nvme_get_driver, struct spdk_pci_driver *, (void), NULL) DEFINE_STUB(spdk_pci_ioat_get_driver, struct spdk_pci_driver *, (void), NULL) DEFINE_STUB(spdk_pci_virtio_get_driver, struct spdk_pci_driver *, (void), NULL) +DEFINE_STUB(spdk_env_thread_launch_pinned, int, (uint32_t core, thread_start_fn fn, void *arg), 0); +DEFINE_STUB_V(spdk_env_thread_wait_all, (void)); +DEFINE_STUB_V(spdk_env_opts_init, (struct spdk_env_opts *opts)); +DEFINE_STUB(spdk_env_init, int, (const struct spdk_env_opts *opts), 0); +DEFINE_STUB_V(spdk_env_fini, (void)); void allocate_cores(uint32_t num_cores) diff --git a/test/env/memory/memory_ut.c b/test/env/memory/memory_ut.c index ce7f96715..e0583375f 100644 --- a/test/env/memory/memory_ut.c +++ b/test/env/memory/memory_ut.c @@ -52,6 +52,11 @@ DEFINE_STUB(rte_mem_event_callback_register, int, (const char *name, rte_mem_event_callback_t clb, void *arg), 0); DEFINE_STUB(rte_mem_virt2iova, rte_iova_t, (const void *virtaddr), 0); DEFINE_STUB(rte_eal_iova_mode, enum rte_iova_mode, (void), RTE_IOVA_VA); +DEFINE_STUB(rte_vfio_is_enabled, int, (const char *modname), 0); +DEFINE_STUB(rte_vfio_noiommu_is_enabled, int, (void), 0); +DEFINE_STUB(rte_memseg_get_fd_thread_unsafe, int, (const struct rte_memseg *ms), 0); +DEFINE_STUB(rte_memseg_get_fd_offset_thread_unsafe, int, + (const struct rte_memseg *ms, size_t *offset), 0); static int test_mem_map_notify(void *cb_ctx, struct spdk_mem_map *map, diff --git a/test/nvme/cuse/cuse.c b/test/nvme/cuse/cuse.c index fe5c26f0c..9a1c38562 100644 --- a/test/nvme/cuse/cuse.c +++ b/test/nvme/cuse/cuse.c @@ -79,6 +79,12 @@ DEFINE_STUB_V(spdk_unaffinitize_thread, (void)); DEFINE_STUB(spdk_nvme_ctrlr_get_ns, struct spdk_nvme_ns *, (struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid), NULL); +DEFINE_STUB(nvme_io_msg_ctrlr_register, int, + (struct spdk_nvme_ctrlr *ctrlr, struct nvme_io_msg_producer *io_msg_producer), 0); + +DEFINE_STUB_V(nvme_io_msg_ctrlr_unregister, + (struct spdk_nvme_ctrlr *ctrlr, struct nvme_io_msg_producer *io_msg_producer)); + static bool wait_for_file(char *filename, bool exists) { diff --git a/test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c b/test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c index d20051178..7d6352f2e 100644 --- a/test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c +++ b/test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c @@ -60,6 +60,9 @@ DEFINE_STUB(spdk_bdev_push_media_events, int, (struct spdk_bdev *bdev, DEFINE_STUB_V(spdk_bdev_notify_media_management, (struct spdk_bdev *bdev)); DEFINE_STUB_V(nvme_ctrlr_depopulate_namespace_done, (struct nvme_bdev_ctrlr *ctrlr)); DEFINE_STUB_V(spdk_bdev_module_finish_done, (void)); +DEFINE_STUB(spdk_nvme_transport_id_trtype_str, const char *, (enum spdk_nvme_transport_type trtype), + NULL); +DEFINE_STUB(spdk_nvme_transport_id_adrfam_str, const char *, (enum spdk_nvmf_adrfam adrfam), NULL); struct nvme_request { spdk_nvme_cmd_cb cb_fn; diff --git a/test/unit/lib/bdev/compress.c/compress_ut.c b/test/unit/lib/bdev/compress.c/compress_ut.c index b6aacde82..68573afeb 100644 --- a/test/unit/lib/bdev/compress.c/compress_ut.c +++ b/test/unit/lib/bdev/compress.c/compress_ut.c @@ -293,6 +293,12 @@ DEFINE_STUB_V(spdk_reduce_vol_load, (struct spdk_reduce_backing_dev *backing_dev spdk_reduce_vol_op_with_handle_complete cb_fn, void *cb_arg)); DEFINE_STUB(spdk_reduce_vol_get_params, const struct spdk_reduce_vol_params *, (struct spdk_reduce_vol *vol), NULL); +DEFINE_STUB_V(spdk_reduce_vol_init, (struct spdk_reduce_vol_params *params, + struct spdk_reduce_backing_dev *backing_dev, + const char *pm_file_dir, + spdk_reduce_vol_op_with_handle_complete cb_fn, void *cb_arg)); +DEFINE_STUB_V(spdk_reduce_vol_destroy, (struct spdk_reduce_backing_dev *backing_dev, + spdk_reduce_vol_op_complete cb_fn, void *cb_arg)); /* DPDK stubs */ DEFINE_STUB(rte_socket_id, unsigned, (void), 0); diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index 18a1eb02c..238823ebe 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -56,6 +56,8 @@ DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t po uint32_t size, uint64_t object_id, uint64_t arg1)); 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)); struct ut_bdev { struct spdk_bdev bdev; diff --git a/test/unit/lib/event/app.c/app_ut.c b/test/unit/lib/event/app.c/app_ut.c index f24ef6ef5..605f18650 100644 --- a/test/unit/lib/event/app.c/app_ut.c +++ b/test/unit/lib/event/app.c/app_ut.c @@ -43,13 +43,18 @@ DEFINE_STUB_V(spdk_event_call, (struct spdk_event *event)); DEFINE_STUB(spdk_event_allocate, struct spdk_event *, (uint32_t core, spdk_event_fn fn, void *arg1, void *arg2), NULL); DEFINE_STUB_V(spdk_subsystem_init, (spdk_subsystem_init_fn cb_fn, void *cb_arg)); +DEFINE_STUB_V(spdk_subsystem_fini, (spdk_msg_fn cb_fn, void *cb_arg)); DEFINE_STUB_V(spdk_rpc_register_method, (const char *method, spdk_rpc_method_handler func, uint32_t state_mask)); DEFINE_STUB_V(spdk_rpc_register_alias_deprecated, (const char *method, const char *alias)); DEFINE_STUB_V(spdk_rpc_set_state, (uint32_t state)); DEFINE_STUB(spdk_rpc_get_state, uint32_t, (void), SPDK_RPC_RUNTIME); +DEFINE_STUB_V(spdk_rpc_initialize, (const char *listen_addr)); +DEFINE_STUB_V(spdk_rpc_finish, (void)); DEFINE_STUB_V(spdk_app_json_config_load, (const char *json_config_file, const char *rpc_addr, spdk_subsystem_init_fn cb_fn, void *cb_arg, bool stop_on_error)); +DEFINE_STUB_V(spdk_reactors_start, (void)); +DEFINE_STUB_V(spdk_reactors_stop, (void *arg1)); static void unittest_usage(void)