Commit 1a5bdab3 authored by Ankit Kumar's avatar Ankit Kumar Committed by Jim Harris
Browse files

event: use extended version of fd group add 



Since both the reactor file descriptors are of type eventfd we can set
fd type in the event handler opts and use SPDK_FD_GROUP_ADD_EXT.
This way we don't need to explicitly read those fds, which will be done
during the fd group wait.

Change-Id: Ic966919a9b2ce83395f98e7c6c6a883b1ffd9a0d
Signed-off-by: default avatarAnkit Kumar <ankit.kumar@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25431


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 92d1e663

lib/event/reactor.c

+8 −20
Original line number Diff line number Diff line
@@ -611,16 +611,6 @@ event_queue_run_batch(void *arg) 
		uint64_t notify = 1;

		int rc;



		/* There may be race between event_acknowledge and another producer's event_notify,

		 * so event_acknowledge should be applied ahead. And then check for self's event_notify.

		 * This can avoid event notification missing.

		 */

		rc = read(reactor->events_fd, &notify, sizeof(notify));

		if (rc < 0) {

			SPDK_ERRLOG("failed to acknowledge event queue: %s.\n", spdk_strerror(errno));

			return -errno;

		}



		count = spdk_ring_dequeue(reactor->events, events, SPDK_EVENT_BATCH_SIZE);



		if (spdk_ring_count(reactor->events) != 0) {
@@ -1471,15 +1461,9 @@ reactor_schedule_thread_event(void *arg) 
	struct spdk_reactor *reactor = arg;

	struct spdk_lw_thread *lw_thread, *tmp;

	uint32_t count = 0;

	uint64_t notify = 1;



	assert(reactor->in_interrupt);



	if (read(reactor->resched_fd, &notify, sizeof(notify)) < 0) {

		SPDK_ERRLOG("failed to acknowledge reschedule: %s.\n", spdk_strerror(errno));

		return -errno;

	}



	TAILQ_FOREACH_SAFE(lw_thread, &reactor->threads, link, tmp) {

		count += reactor_post_process_lw_thread(reactor, lw_thread) ? 1 : 0;

	}
@@ -1490,6 +1474,7 @@ reactor_schedule_thread_event(void *arg) 
static int

reactor_interrupt_init(struct spdk_reactor *reactor)

{

	struct spdk_event_handler_opts opts = {};

	int rc;



	rc = spdk_fd_group_create(&reactor->fgrp);
@@ -1503,8 +1488,11 @@ reactor_interrupt_init(struct spdk_reactor *reactor) 
		goto err;

	}



	rc = SPDK_FD_GROUP_ADD(reactor->fgrp, reactor->resched_fd, reactor_schedule_thread_event,

			       reactor);

	spdk_fd_group_get_default_event_handler_opts(&opts, sizeof(opts));

	opts.fd_type = SPDK_FD_TYPE_EVENTFD;



	rc = SPDK_FD_GROUP_ADD_EXT(reactor->fgrp, reactor->resched_fd,

				   reactor_schedule_thread_event, reactor, &opts);

	if (rc) {

		close(reactor->resched_fd);

		goto err;
@@ -1519,8 +1507,8 @@ reactor_interrupt_init(struct spdk_reactor *reactor) 
		goto err;

	}



	rc = SPDK_FD_GROUP_ADD(reactor->fgrp, reactor->events_fd,

			       event_queue_run_batch, reactor);

	rc = SPDK_FD_GROUP_ADD_EXT(reactor->fgrp, reactor->events_fd,

				   event_queue_run_batch, reactor, &opts);

	if (rc) {

		spdk_fd_group_remove(reactor->fgrp, reactor->resched_fd);

		close(reactor->resched_fd);