Commit 5cf5dbff authored by Ben Walker's avatar Ben Walker
Browse files

net: Add a separate subsystem library 



This breaks the strict dependency on the
SPDK event framework.

Change-Id: Id93d79bfbc482350dc9802fa84a554f7e11f3826
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/365282


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 4808ff79

app/iscsi_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 


C_SRCS := iscsi_tgt.c



SPDK_LIB_LIST = event_bdev event_copy

SPDK_LIB_LIST = event_bdev event_copy event_net

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

SPDK_LIB_LIST += util log log_rpc event app_rpc

app/vhost/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ CFLAGS += $(ENV_CFLAGS) 


C_SRCS := vhost.c



SPDK_LIB_LIST = event_bdev event_copy

SPDK_LIB_LIST = event_bdev event_copy event_net

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

SPDK_LIB_LIST += util log log_rpc event app_rpc

SPDK_LIB_LIST += vhost rte_vhost

include/spdk/net.h

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 


#define IDLE_INTERVAL_TIME_IN_US 5000



void spdk_interface_init(void);

int spdk_interface_destroy(void);



const char *spdk_net_framework_get_name(void);

void spdk_net_framework_start(void);

void spdk_net_framework_clear_socket_association(int sock);

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

DIRS-y += bdev copy net



.PHONY: all clean $(DIRS-y)

lib/event/subsystems/net/Makefile

0 → 100644
+41 −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



CFLAGS += $(ENV_CFLAGS) -I.

C_SRCS = net.c

LIBNAME = event_net



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