d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

event: move app_rpc contents

Browse Source 
There is no need to have the application-level RPCs
defined separately from the event library itself
(which defines the application framework).

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ic264ed761f5ec1a40d604e63395c5740af4be1a6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4363
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2020-09-23 21:12:41 +00:00 committed by Tomasz Zawadzki
parent 2e31825512
commit 73b483c6d2
15 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -34,6 +34,14 @@ not enabled.
A new optional parameter `enable_placement_id` was added to the `sock_impl_set_options`
RPC.
### Miscellaneous
The contents of the log_rpc library have been moved to the event library. The log_rpc
library now no longer exists.
The contents of the app_rpc library have been moved to the event library. The app_rpc
library now no longer exists.
## v20.07: SPDK CSI driver, new accel_fw commands, I/O abort support
### accel

2
app/iscsi_tgt/Makefile
View File

@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c
SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi accel trace conf
SPDK_LIB_LIST += thread util log app_rpc net sock notify
SPDK_LIB_LIST += thread util log net sock notify
ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
SPDK_LIB_LIST += env_dpdk_rpc

2
app/nvmf_tgt/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS := nvmf_main.c
SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_nvmf event_net
SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json net sock
SPDK_LIB_LIST += app_rpc bdev_rpc notify
SPDK_LIB_LIST += bdev_rpc notify
ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
SPDK_LIB_LIST += env_dpdk_rpc

2
app/spdk_tgt/Makefile
View File

@ -52,7 +52,7 @@ endif
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_iscsi event_net event_scsi event_nvmf event
SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi accel rpc jsonrpc json
SPDK_LIB_LIST += app_rpc bdev_rpc net sock notify
SPDK_LIB_LIST += bdev_rpc net sock notify
ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))
SPDK_LIB_LIST += env_dpdk_rpc

2
app/vhost/Makefile
View File

@ -48,7 +48,7 @@ endif
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) event_net event_scsi event
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi accel trace conf
SPDK_LIB_LIST += thread util log app_rpc
SPDK_LIB_LIST += thread util log
SPDK_LIB_LIST += event_nbd nbd net sock notify
ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV))

3
lib/event/Makefile
View File

@ -38,7 +38,8 @@ SO_VER := 5
SO_MINOR := 0
LIBNAME = event
C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c log_rpc.c
C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c log_rpc.c \
app_rpc.c subsystem_rpc.c
SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_event.map)

0
module/event/rpc/app_rpc.c → lib/event/app_rpc.c
View File

0
module/event/rpc/subsystem_rpc.c → lib/event/subsystem_rpc.c
View File

2
mk/spdk.lib_deps.mk
View File

@ -153,8 +153,6 @@ DEPDIRS-bdev_uring := $(BDEV_DEPS_CONF_THREAD)
DEPDIRS-bdev_virtio := $(BDEV_DEPS_CONF_THREAD) virtio
# module/event
# module/event/app
DEPDIRS-app_rpc := log util thread event $(JSON_LIBS)
# module/event/subsystems
# These depdirs include subsystem interdependencies which

2
module/event/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = subsystems rpc
DIRS-y = subsystems
.PHONY: all clean $(DIRS-y)

45
module/event/rpc/Makefile
View File

@ -1,45 +0,0 @@
#
# BSD LICENSE
#
# Copyright (c) Intel Corporation.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Intel Corporation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
SO_VER := 2
SO_MINOR := 0
C_SRCS = app_rpc.c subsystem_rpc.c
LIBNAME = app_rpc
SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

2
test/app/bdev_svc/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS := bdev_svc.c
SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
SPDK_LIB_LIST += nvmf event log trace conf thread util bdev accel rpc jsonrpc json sock blobfs_bdev
SPDK_LIB_LIST += app_rpc bdev_rpc notify
SPDK_LIB_LIST += bdev_rpc notify
ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd

2
test/bdev/bdevio/Makefile
View File

@ -41,7 +41,7 @@ C_SRCS := bdevio.c
SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
SPDK_LIB_LIST += app_rpc bdev bdev_rpc accel event trace log conf thread util rpc jsonrpc json sock notify
SPDK_LIB_LIST += bdev bdev_rpc accel event trace log conf thread util rpc jsonrpc json sock notify
LIBS += -lcunit

2
test/bdev/bdevperf/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS := bdevperf.c
SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM)
SPDK_LIB_LIST += bdev accel event trace log conf thread util sock notify
SPDK_LIB_LIST += rpc jsonrpc json app_rpc bdev_rpc
SPDK_LIB_LIST += rpc jsonrpc json bdev_rpc
ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd

2
test/event/app_repeat/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS := app_repeat.c
# the repeatable ones.
SPDK_LIB_LIST = event_bdev event_accel event_vmd event_sock
SPDK_LIB_LIST += event log trace conf thread util bdev accel rpc jsonrpc json sock vmd
SPDK_LIB_LIST += app_rpc bdev_rpc notify
SPDK_LIB_LIST += bdev_rpc notify
SPDK_LIB_LIST += event_nbd nbd
BLOCKDEV_LIST = bdev_malloc bdev_null