diff --git a/lib/event/Makefile b/lib/event/Makefile index 09859a301..8925e168d 100644 --- a/lib/event/Makefile +++ b/lib/event/Makefile @@ -34,11 +34,13 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 2 +SO_VER := 3 SO_MINOR := 0 SO_SUFFIX := $(SO_VER).$(SO_MINOR) LIBNAME = event C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c +SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_event.map) + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/event/spdk_event.map b/lib/event/spdk_event.map new file mode 100644 index 000000000..c556a979c --- /dev/null +++ b/lib/event/spdk_event.map @@ -0,0 +1,46 @@ +{ + global: + + # Public functions + spdk_app_opts_init; + spdk_app_start; + spdk_app_fini; + spdk_app_start_shutdown; + spdk_app_stop; + spdk_app_get_running_config; + spdk_app_get_shm_id; + spdk_app_parse_core_mask; + spdk_app_get_core_mask; + spdk_app_parse_args; + spdk_app_usage; + spdk_event_allocate; + spdk_event_call; + spdk_framework_enable_context_switch_monitor; + spdk_framework_context_switch_monitor_enabled; + + # Functions used by other SPDK libraries + spdk_reactors_init; + spdk_reactors_fini; + spdk_reactors_start; + spdk_reactors_stop; + spdk_reactor_get; + spdk_for_each_reactor; + spdk_subsystem_find; + spdk_add_subsystem; + spdk_add_subsystem_depend; + spdk_subsystem_init; + spdk_subsystem_fini; + spdk_subsystem_init_next; + spdk_subsystem_fini_next; + spdk_subsystem_config; + spdk_app_json_config_load; + spdk_subsystem_config_json; + spdk_rpc_initialize; + spdk_rpc_finish; + + # Macros and variables + g_subsystems; + g_subsystems_deps; + + local: *; +}; diff --git a/module/event/rpc/app_rpc.c b/module/event/rpc/app_rpc.c index 7de1494ef..06fead7f5 100644 --- a/module/event/rpc/app_rpc.c +++ b/module/event/rpc/app_rpc.c @@ -80,7 +80,7 @@ spdk_rpc_spdk_kill_instance(struct spdk_jsonrpc_request *request, if (spdk_json_decode_object(params, rpc_spdk_kill_instance_decoders, SPDK_COUNTOF(rpc_spdk_kill_instance_decoders), &req)) { - SPDK_DEBUGLOG(SPDK_LOG_REACTOR, "spdk_json_decode_object failed\n"); + SPDK_DEBUGLOG(SPDK_LOG_APP_RPC, "spdk_json_decode_object failed\n"); goto invalid; } @@ -97,7 +97,7 @@ spdk_rpc_spdk_kill_instance(struct spdk_jsonrpc_request *request, goto invalid; } - SPDK_DEBUGLOG(SPDK_LOG_REACTOR, "sending signal %d\n", signals[i].signal); + SPDK_DEBUGLOG(SPDK_LOG_APP_RPC, "sending signal %d\n", signals[i].signal); free_rpc_spdk_kill_instance(&req); kill(getpid(), signals[i].signal); @@ -133,7 +133,7 @@ spdk_rpc_framework_monitor_context_switch(struct spdk_jsonrpc_request *request, if (spdk_json_decode_object(params, rpc_framework_monitor_context_switch_decoders, SPDK_COUNTOF(rpc_framework_monitor_context_switch_decoders), &req)) { - SPDK_DEBUGLOG(SPDK_LOG_REACTOR, "spdk_json_decode_object failed\n"); + SPDK_DEBUGLOG(SPDK_LOG_APP_RPC, "spdk_json_decode_object failed\n"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); return; } @@ -537,3 +537,4 @@ err: free(ctx); } SPDK_RPC_REGISTER("thread_set_cpumask", spdk_rpc_thread_set_cpumask, SPDK_RPC_RUNTIME) +SPDK_LOG_REGISTER_COMPONENT("APP_RPC", SPDK_LOG_APP_RPC) diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index d74a70c15..3158b4c52 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -33,6 +33,8 @@ function confirm_abi_deps() { name = SPDK_LOG_BLOBFS_BDEV [suppress_variable] name = SPDK_LOG_BLOBFS_BDEV_RPC +[suppress_variable] + name = SPDK_LOG_APP_RPC EOF