Commit 2491021f authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvmf: convert nvmf_tgt into an event subsystem 



This is required as part of our effort to build a single target app that
can run e.g. NVMe-oF and iSCSI targets in the same process.

Change-Id: Ic8426df08899070d709e3675a57f47f64c23c5eb
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/403218


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 9df7fac1

app/nvmf_tgt/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 


APP = nvmf_tgt



C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c

C_SRCS := nvmf_main.c



SPDK_LIB_LIST = event_bdev event_copy

SPDK_LIB_LIST = event_bdev event_copy event_nvmf

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

SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc

app/nvmf_tgt/nvmf_main.c

+11 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "spdk/stdinc.h"



#include "spdk/env.h"

#include "nvmf_tgt.h"

#include "spdk/event.h"

#include "spdk/log.h"
@@ -51,6 +50,15 @@ nvmf_parse_arg(int ch, char *arg) 
{

}



static void

nvmf_tgt_started(void *arg1, void *arg2)

{

	if (getenv("MEMZONE_DUMP") != NULL) {

		spdk_memzone_dump(stdout);

		fflush(stdout);

	}

}



int

main(int argc, char **argv)

{
@@ -68,7 +76,8 @@ main(int argc, char **argv) 
		exit(rc);

	}



	rc = spdk_nvmf_tgt_start(&opts);

	/* Blocks until the application is exiting */

	rc = spdk_app_start(&opts, nvmf_tgt_started, NULL, NULL);



	return rc;

}

lib/event/subsystems/Makefile

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

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



DIRS-y += bdev copy iscsi nbd net scsi vhost

DIRS-y += bdev copy iscsi nbd net nvmf scsi vhost



.PHONY: all clean $(DIRS-y)

lib/event/subsystems/nvmf/Makefile

0 → 100644
+40 −0
Original line number Diff line number Diff line 
#

#  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



C_SRCS = conf.c nvmf_rpc.c nvmf_tgt.c

LIBNAME = event_nvmf



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

app/nvmf_tgt/conf.c→lib/event/subsystems/nvmf/conf.c

+1 −3
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "spdk/stdinc.h"



#include "nvmf_tgt.h"

#include "event_nvmf.h"



#include "spdk/conf.h"

#include "spdk/log.h"