Commit e7485922 authored by Ben Walker's avatar Ben Walker
Browse files

net: Move module initialization into event_net 



This removes the event framework dependency from the net
library entirely.

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 199e4862

include/spdk/net.h

+2 −2
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ 


#define IDLE_INTERVAL_TIME_IN_US 5000



void spdk_interface_init(void);

int spdk_interface_init(void);

int spdk_interface_destroy(void);



const char *spdk_net_framework_get_name(void);

void spdk_net_framework_start(void);

int spdk_net_framework_start(void);

void spdk_net_framework_clear_socket_association(int sock);

int spdk_net_framework_fini(void);

int spdk_net_framework_idle_time(void);

lib/event/subsystems/net/net.c

+36 −2
Original line number Diff line number Diff line
@@ -37,7 +37,41 @@ 


#include "spdk_internal/event.h"



SPDK_SUBSYSTEM_REGISTER(interface, spdk_interface_init, spdk_interface_destroy, NULL)

static void

spdk_interface_subsystem_init(void)

{

	int rc;



SPDK_SUBSYSTEM_REGISTER(net_framework, spdk_net_framework_start, spdk_net_framework_fini, NULL)

	rc = spdk_interface_init();



	spdk_subsystem_init_next(rc);

}



static int

spdk_interface_subsystem_destroy(void)

{

	return spdk_interface_destroy();

}



SPDK_SUBSYSTEM_REGISTER(interface, spdk_interface_subsystem_init,

			spdk_interface_subsystem_destroy, NULL)



static void

spdk_net_subsystem_start(void)

{

	int rc;



	rc = spdk_net_framework_start();



	spdk_subsystem_init_next(rc);

}



static int

spdk_net_subsystem_fini(void)

{

	return spdk_net_framework_fini();

}



SPDK_SUBSYSTEM_REGISTER(net_framework, spdk_net_subsystem_start,

			spdk_net_subsystem_fini, NULL)

SPDK_SUBSYSTEM_DEPEND(net_framework, interface)

lib/net/interface.c

+4 −6
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#include "spdk/log.h"

#include "spdk/net.h"



#include "spdk_internal/event.h"



#ifdef __linux__ /* Interface management is Linux-specific */



#include <linux/netlink.h>
@@ -414,14 +412,14 @@ static void spdk_interface_ip_update(void) 
	pthread_mutex_unlock(&interface_lock);

}



void

int

spdk_interface_init(void)

{

	TAILQ_INIT(&g_interface_head);

	spdk_prepare_ifc_list();

	spdk_get_ifc_ipv4();



	spdk_subsystem_init_next(0);

	return 0;

}



int
@@ -463,10 +461,10 @@ void *spdk_interface_get_list(void) 


#else /* Not Linux */



void

int

spdk_interface_init(void)

{

	spdk_subsystem_init_next(0);

	return 0;

}



int

lib/net/net_framework_default.c

+2 −4
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 


#include "spdk/net.h"



#include "spdk_internal/event.h"



__attribute__((weak))

const char *spdk_net_framework_get_name(void)

{
@@ -42,9 +40,9 @@ const char *spdk_net_framework_get_name(void) 
}



__attribute__((weak))

void spdk_net_framework_start(void)

int spdk_net_framework_start(void)

{

	spdk_subsystem_init_next(0);

	return 0;

}



__attribute__((weak))

lib/net/sock.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include "spdk/stdinc.h"



#include "spdk/event.h"

#include "spdk/log.h"

#include "spdk/net.h"