Commit abd932d6 authored by Jim Harris's avatar Jim Harris
Browse files

Revert "event: switch reactors to poll mode before stopping" 



This patch has introduced intermittent failures in CI. See issue #3351.

This reverts commit 3f2c8979.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: Ic078f1876ac998ae21c3d2ee9628e732a3a6e9b3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22913


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
parent 3f2c8979

lib/event/reactor.c

+6 −31
Original line number Diff line number Diff line
@@ -997,11 +997,14 @@ reactor_run(void *arg) 
				_reactor_remove_lw_thread(reactor, lw_thread);

				spdk_thread_destroy(thread);

			} else {

				assert(!reactor->in_interrupt);

				if (spdk_unlikely(reactor->in_interrupt)) {

					reactor_interrupt_run(reactor);

				} else {

					spdk_thread_poll(thread, 0, 0);

				}

			}

		}

	}



	return 0;

}
@@ -1103,38 +1106,10 @@ nop(void *arg1, void *arg2) 
{

}



static void

_reactors_stop_disable_interrupt(void *ctx)

{

	struct spdk_reactor *reactor = ctx;

	uint32_t lcore;

	int rc;



	if (reactor == NULL) {

		lcore = spdk_env_get_first_core();

	} else {

		lcore = spdk_env_get_next_core(reactor->lcore);

	}



	while (lcore < SPDK_ENV_LCORE_ID_ANY) {

		reactor = spdk_reactor_get(lcore);

		assert(reactor != NULL);

		if (reactor->in_interrupt) {

			rc = spdk_reactor_set_interrupt_mode(lcore, false, _reactors_stop_disable_interrupt, reactor);

			if (rc == 0) {

				return;

			}

		}

		lcore = spdk_env_get_next_core(lcore);

	}



	spdk_for_each_reactor(nop, NULL, NULL, _reactors_stop);

}



void

spdk_reactors_stop(void *arg1)

{

	_reactors_stop_disable_interrupt(NULL);

	spdk_for_each_reactor(nop, NULL, NULL, _reactors_stop);

}



static pthread_mutex_t g_scheduler_mtx = PTHREAD_MUTEX_INITIALIZER;