Cleanup for Flow Enhancements PR

CMakeLists.txt

@@ -180,7 +180,7 @@ endif()
 add_subdirectory(fdbbackup)
 add_subdirectory(contrib)
 add_subdirectory(tests)
-add_subdirectory(flowbench)
+add_subdirectory(flowbench EXCLUDE_FROM_ALL)
 if(WITH_PYTHON AND WITH_C_BINDING)
   add_subdirectory(bindings)
 endif()

flow/AsioReactor.h

@@ -39,7 +39,6 @@ public:
 
 	void sleep(double timeout);
 	void react();
-	void react_block();
 
 	void wake();
 

flow/Net2.actor.cpp

@@ -1370,12 +1370,6 @@ ACTOR Future<Void> Net2::logTimeOffset() {
 	}
 }
 
-// Unused implementation of threaded reactor IO
-THREAD_FUNC_RETURN reactorThreadTest(void* reactor) {
-	loop { ((ASIOReactor*)reactor)->react_block(); }
-	THREAD_RETURN;
-}
-
 void Net2::initMetrics() {
 	bytesReceived.init(LiteralStringRef("Net2.BytesReceived"));
 	countWriteProbes.init(LiteralStringRef("Net2.CountWriteProbes"));
@@ -1438,7 +1432,6 @@ void Net2::run() {
 
 	started.store(true);
 	double nnow = timer_monotonic();
-	// startThread(reactorThreadTest, (void*)&reactor, 0, 0);
 
 	while (!stopped) {
 		FDB_TRACE_PROBE(run_loop_begin);
@@ -1506,7 +1499,7 @@ void Net2::run() {
 			ready.push(timers.top());
 			timers.pop();
 		}
-		// is this double counting?
+		// FIXME: Is this double counting?
 		countTimers += numTimers;
 		FDB_TRACE_PROBE(run_loop_ready_timers, numTimers);
 
@@ -1617,7 +1610,7 @@ void Net2::run() {
 		    nondeterministicRandom()->random01() < (nnow - now) * FLOW_KNOBS->SLOW_LOOP_SAMPLING_RATE)
 			TraceEvent("SomewhatSlowRunLoopBottom")
 			    .detail("Elapsed", nnow - now); // This includes the time spent running tasks
-	} // while (!stopped)
+	}
 
 	for (auto& fn : stopCallbacks) {
 		fn();
@@ -2006,12 +1999,6 @@ void ASIOReactor::react() {
 		++network->countASIOEvents; // Make this a task?
 }
 
-void ASIOReactor::react_block() {
-	ios.run_one();
-	ios.restart();
-	++network->countASIOEvents;
-}
-
 void ASIOReactor::wake() {
 	ios.post(nullCompletionHandler);
 }