D49220.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49220.diff
View Options

	diff --git a/tests/sys/netmap/ctrl-api-test.c b/tests/sys/netmap/ctrl-api-test.c
	--- a/tests/sys/netmap/ctrl-api-test.c
	+++ b/tests/sys/netmap/ctrl-api-test.c
	@@ -1596,6 +1596,7 @@
	return sync_kloop_start_stop(ctx);
	}

	+#if 0
	static int
	sync_kloop_conflict(struct TestContext *ctx)
	{
	@@ -1640,6 +1641,14 @@
	/* Wait for one of the two threads to fail to start the kloop, to
	* avoid a race condition where th1 starts the loop and stops,
	* and after that th2 starts the loop successfully. */
	+ /*
	+ * XXX: This doesn't fully close the race. th2 might fail to
	+ * start executing since th1 can enter the kernel and hog the
	+ * CPU on a single-CPU system until the semaphore timeout
	+ * awakens this thread and it calls sync_kloop_stop. Once th1
	+ * exits the kernel, th2 can finally run and will then loop
	+ * forever in the ioctl handler.
	+ */
	clock_gettime(CLOCK_REALTIME, &to);
	to.tv_sec += 2;
	ret = sem_timedwait(&sem, &to);
	@@ -1674,6 +1683,7 @@
	? 0
	: -1;
	}
	+#endif

	static int
	sync_kloop_eventfds_mismatch(struct TestContext *ctx)
	@@ -2079,7 +2089,9 @@
	decltest(sync_kloop_eventfds_all_direct_rx),
	decltest(sync_kloop_nocsb),
	decltest(sync_kloop_csb_enable),
	+#if 0
	decltest(sync_kloop_conflict),
	+#endif
	decltest(sync_kloop_eventfds_mismatch),
	decltest(null_port),
	decltest(null_port_all_zero),