Commit 2b22e2aa authored by Ben Walker's avatar Ben Walker
Browse files

rpc: Move module initialization to event_rpc 



This removes one of the dependencies on the event framework.

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


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 e7485922

include/spdk/rpc.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include "spdk/jsonrpc.h"



void spdk_rpc_initialize(void);

int spdk_rpc_initialize(void);

int spdk_rpc_finish(void);

void spdk_rpc_config_text(FILE *fp);

lib/event/subsystems/rpc/rpc.c

+18 −1
Original line number Diff line number Diff line
@@ -37,4 +37,21 @@ 


#include "spdk_internal/event.h"



SPDK_SUBSYSTEM_REGISTER(spdk_rpc, spdk_rpc_initialize, spdk_rpc_finish, spdk_rpc_config_text)
 
static void

spdk_rpc_subsystem_initialize(void)

{

	int rc;



	rc = spdk_rpc_initialize();



	spdk_subsystem_init_next(rc);

}



static int

spdk_rpc_subsystem_finish(void)

{

	return spdk_rpc_finish();

}



SPDK_SUBSYSTEM_REGISTER(spdk_rpc, spdk_rpc_subsystem_initialize,

			spdk_rpc_subsystem_finish, spdk_rpc_config_text)

lib/rpc/rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ spdk_rpc_setup(void *arg) 
			     RPC_SELECT_INTERVAL);

}



void

int

spdk_rpc_initialize(void)

{

	/*
@@ -236,7 +236,7 @@ spdk_rpc_initialize(void) 
	 */

	spdk_poller_register(&g_rpc_poller, spdk_rpc_setup, NULL, spdk_env_get_current_core(), 0);



	spdk_subsystem_init_next(0);

	return 0;

}



int