Commit c3ede774 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

event: remove spdk_event_t typedef 



Use 'struct spdk_event *' directly for consistency with the rest of the
API.

Change-Id: Ib41a9bf47f5b18f4aebf5f4dee055455cb12ef7d
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 9d901545

app/nvmf_tgt/nvmf_tgt.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ _nvmf_tgt_start_subsystem(void *arg1, void *arg2) 
void

nvmf_tgt_start_subsystem(struct nvmf_tgt_subsystem *app_subsys)

{

	spdk_event_t event;

	struct spdk_event *event;



	event = spdk_event_allocate(app_subsys->lcore, _nvmf_tgt_start_subsystem,

				    app_subsys, NULL, NULL);

include/spdk/event.h

+4 −5
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 


#include "spdk/queue.h"



typedef struct spdk_event *spdk_event_t;

typedef void (*spdk_event_fn)(void *arg1, void *arg2);



/**
@@ -199,14 +198,14 @@ uint32_t spdk_app_get_current_core(void); 
/**

 * \brief Allocate an event to be passed to \ref spdk_event_call

 */

spdk_event_t spdk_event_allocate(uint32_t lcore, spdk_event_fn fn,

struct spdk_event *spdk_event_allocate(uint32_t lcore, spdk_event_fn fn,

				       void *arg1, void *arg2,

				 spdk_event_t next);

				       struct spdk_event *next);



/**

 * \brief Pass the given event to the associated lcore and call the function.

 */

void spdk_event_call(spdk_event_t event);

void spdk_event_call(struct spdk_event *event);



/* TODO: This is only used by tests and should be made private */

uint32_t spdk_event_queue_run_batch(uint32_t lcore);

include/spdk/scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct spdk_scsi_task { 
	struct spdk_io_channel		*ch;

	struct spdk_scsi_port		*target_port;

	struct spdk_scsi_port		*initiator_port;

	spdk_event_t			cb_event;

	struct spdk_event 		*cb_event;



	uint32_t ref;

	uint32_t id;

lib/bdev/bdev.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ spdk_bdev_cleanup_pending_rbuf_io(struct spdk_bdev *bdev) 
}



static void

__submit_request(struct spdk_bdev *bdev, struct spdk_bdev_io *bdev_io, spdk_event_t cb_event)

__submit_request(struct spdk_bdev *bdev, struct spdk_bdev_io *bdev_io, struct spdk_event *cb_event)

{

	bdev_io->cb_event = cb_event;

lib/event/app.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct spdk_app { 
};



static struct spdk_app g_spdk_app;

static spdk_event_t g_shutdown_event = NULL;

static struct spdk_event *g_shutdown_event = NULL;



static int spdk_app_write_pidfile(void);

static void spdk_app_remove_pidfile(void);
@@ -429,7 +429,7 @@ spdk_app_fini(void) 
int

spdk_app_start(spdk_event_fn start_fn, void *arg1, void *arg2)

{

	spdk_event_t event;

	struct spdk_event *event;



	g_spdk_app.rc = 0;