Commit bc83adc2 authored by Seth Howell's avatar Seth Howell Committed by Darek Stojaczyk
Browse files

lib: move trace_rpc into lib/trace 



Combinining these two libraries removes some directory complexity. It
also helps us to align on a common practice for including the rpc code
with a given module. This is how all of our bdev modules already do it.
The nbd, net, and scsi modules also follow this pattern.

Change-Id: I5e4c99d7f0facacc6dfe30b2274b60e0d151f8d8
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465210


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ef6108a7

app/iscsi_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c 
SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_vmd event

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf

SPDK_LIB_LIST += thread util log log_rpc trace_rpc app_rpc net sock notify

SPDK_LIB_LIST += thread util log log_rpc app_rpc net sock notify



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/nvmf_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ C_SRCS := nvmf_main.c 
SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += event_bdev event_copy event_nvmf event_net event_vmd

SPDK_LIB_LIST += nvmf event log trace conf thread util bdev copy rpc jsonrpc json net sock

SPDK_LIB_LIST += app_rpc log_rpc trace_rpc bdev_rpc notify

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc notify



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/spdk_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ endif 


SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event_vmd event

SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json

SPDK_LIB_LIST += app_rpc log_rpc trace_rpc bdev_rpc net sock notify

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net sock notify



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/vhost/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ endif 


SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event_vmd event

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf

SPDK_LIB_LIST += thread util log log_rpc trace_rpc app_rpc

SPDK_LIB_LIST += thread util log log_rpc app_rpc

SPDK_LIB_LIST += event_nbd nbd net sock notify



include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

lib/trace/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



C_SRCS = trace.c trace_flags.c

C_SRCS = trace.c trace_flags.c trace_rpc.c

LIBNAME = trace



DIRS-y = rpc



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk