4bcfef0021
RPC is core functionality for SPDK applications and should always be initialized last (after all subsystems have been initialized). So make RPC a first class citizen and integrate it with the app framework directly instead of making it an "optional" subsystem. Then we initializing it after all subsystems have completed initialization, and tear it down before tearing down subsystems. We can also do some other cleanup while here - for example, reactors are already started when spdk_rpc_initialize() is called, so remove the extra event that was added during initialization since this is no longer needed. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I4cc63586a6d55be68786629a2176c61a88979267 Reviewed-on: https://review.gerrithub.io/385914 Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
71 lines
2.6 KiB
Makefile
71 lines
2.6 KiB
Makefile
#
|
|
# 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.
|
|
#
|
|
|
|
# This snippet will be included into the RocksDB Makefile
|
|
|
|
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
|
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
|
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
|
|
|
|
CXXFLAGS += -I$(SPDK_DIR)/include -Iinclude/
|
|
|
|
# The SPDK makefiles turn this on, but RocksDB won't compile with it. So
|
|
# turn it off after including the SPDK makefiles.
|
|
CXXFLAGS += -Wno-missing-declarations
|
|
|
|
# The SPDK Makefiles may turn these options on but we do not want to enable
|
|
# them for the RocksDB source files.
|
|
CXXFLAGS += -fno-profile-arcs -fno-test-coverage
|
|
ifeq ($(CONFIG_UBSAN),y)
|
|
CXXFLAGS += -fno-sanitize=undefined
|
|
endif
|
|
ifeq ($(CONFIG_ASAN),y)
|
|
CXXFLAGS += -fno-sanitize=address
|
|
endif
|
|
|
|
SPDK_LIB_LIST = event_bdev event_copy
|
|
SPDK_LIB_LIST += blobfs bdev copy event util conf trace \
|
|
log jsonrpc json rpc
|
|
|
|
AM_LINK += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)
|
|
AM_LINK += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
|
|
AM_LINK += -luuid
|
|
|
|
ifeq ($(CONFIG_UBSAN),y)
|
|
AM_LINK += -fsanitize=undefined
|
|
endif
|
|
|
|
ifeq ($(CONFIG_COVERAGE),y)
|
|
AM_LINK += -fprofile-arcs -ftest-coverage
|
|
endif
|