ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: merge nvmf.c and framework.c

Browse Source 
There is no logical split between nvmf.c and framework.c, so combine
them and drop nvmf.c.

Change-Id: I91230c01ed7f171bfed04456b0bfcf0e7ddbc263
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-07 15:51:23 -07:00
parent ca4932f995
commit d67021b0e4
3 changed files with 20 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvmf/Makefile
View File

@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
CFLAGS += $(DPDK_INC) CFLAGS += $(DPDK_INC)
LIBNAME = nvmf LIBNAME = nvmf
C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c nvmf.c \ C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c \
rdma.c port.c conn.c controller.c \ rdma.c port.c conn.c controller.c \
init_grp.c subsystem_grp.c conf.c \ init_grp.c subsystem_grp.c conf.c \
framework.c session.c framework.c session.c

19
lib/nvmf/framework.c
View File

@ -45,6 +45,7 @@
#include "subsystem_grp.h" #include "subsystem_grp.h"
#include "spdk/trace.h" #include "spdk/trace.h"
SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
#define MAX_SUBSYSTEMS 4 #define MAX_SUBSYSTEMS 4
@ -343,6 +344,24 @@ nvmf_tgt_subsystem_fini(void)
return 0; return 0;
} }
int
nvmf_initialize(void)
{
if (request_mempool == NULL) {
fprintf(stderr, "NVMf application has not created request mempool!\n");
return -1;
}
return 0;
}
void
nvmf_shutdown(void)
{
SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_shutdown\n");
spdk_nvmf_shutdown_nvme();
}
SPDK_SUBSYSTEM_REGISTER(nvmf, nvmf_tgt_subsystem_initialize, nvmf_tgt_subsystem_fini, NULL) SPDK_SUBSYSTEM_REGISTER(nvmf, nvmf_tgt_subsystem_initialize, nvmf_tgt_subsystem_fini, NULL)

70
lib/nvmf/nvmf.c
View File

@ -1,70 +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.
*/
#include <arpa/inet.h>
#include "conn.h"
#include "controller.h"
#include "port.h"
#include "init_grp.h"
#include "nvmf_internal.h"
#include "nvmf.h"
#include "rdma.h"
#include "subsystem_grp.h"
#include "spdk/conf.h"
#include "spdk/log.h"
#include "spdk/pci.h"
#include "spdk/trace.h"
SPDK_LOG_REGISTER_TRACE_FLAG("nvmf", SPDK_TRACE_NVMF)
extern struct rte_mempool *request_mempool;
int
nvmf_initialize(void)
{
if (request_mempool == NULL) {
fprintf(stderr, "NVMf application has not created request mempool!\n");
return -1;
}
return 0;
}
void
nvmf_shutdown(void)
{
SPDK_TRACELOG(SPDK_TRACE_NVMF, "nvmf_shutdown\n");
spdk_nvmf_shutdown_nvme();
}