Merge pull request #13303 from tclinkenbeard-oai/dev/tclinkenbeard/actorcompiler-include-cleanup

Clean up actor compiler includes

Author: tclinkenbeard-oai

documentation/tutorial/make_h2o.actor.cpp

@@ -25,14 +25,15 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "flow/TLSConfig.h"
-#include "flow/actorcompiler.h"
 
 #include <functional>
 #include <iostream>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
+#include "flow/actorcompiler.h"
+
 // Flow solution to https://leetcode.com/problems/building-h2o/
 //
 // The description of this problem calls for threads running as

documentation/tutorial/play.actor.cpp

@@ -23,11 +23,12 @@
 #include "flow/flow.h"
 #include "flow/Platform.h"
 #include "flow/TLSConfig.h"
-#include "flow/actorcompiler.h"
 
 #include <iostream>
 #include <vector>
 
+#include "flow/actorcompiler.h"
+
 /// Use this file as means to play with flow code
 /// The goal is to give you a starting point with a boilerplate template
 /// Don't expect frequent changes to this file unless we want to change the base template

documentation/tutorial/play_network.actor.cpp

@@ -23,11 +23,12 @@
 #include "flow/flow.h"
 #include "flow/Platform.h"
 #include "flow/TLSConfig.h"
-#include "flow/actorcompiler.h"
 
 #include <iostream>
 #include <vector>
 
+#include "flow/actorcompiler.h"
+
 /// This file has code similar to play.actor.cpp, but for client/server actors talking over a network
 /// It's also similar to tutorial.actor.cpp but only has the minimal code needed for testing client/server actor
 /// interactions over the network.
@@ -217,4 +218,4 @@ int main(int argc, char* argv[]) {
 	g_network->run();
 
 	return 0;
-}
+}

documentation/tutorial/print_in_order.actor.cpp

@@ -25,14 +25,15 @@
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/ReadYourWrites.h"
 #include "flow/TLSConfig.h"
-#include "flow/actorcompiler.h"
 
 #include <functional>
 #include <iostream>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
+#include "flow/actorcompiler.h"
+
 // Solution to https://leetcode.com/problems/print-in-order/description/
 //
 // This is a super basic concurrency exercise useful as a day 1

fdbclient/CoordinationInterface.cpp

@@ -29,12 +29,11 @@
 #endif
 #include "boost/asio.hpp"
 #include "fdbclient/CoordinationInterface.h"
-#include "flow/actorcompiler.h"
 
 IPAddress ClusterConnectionString::determineLocalSourceIP() const {
 	int size = coords.size() + hostnames.size();
 	int index = 0;
-	loop {
+	while (true) {
 		try {
 			using namespace boost::asio;
 

fdbclient/GlobalConfig.cpp

@@ -27,8 +27,6 @@
 #include "flow/flow.h"
 #include "flow/genericactors.actor.h"
 
-#include "flow/actorcompiler.h" // This must be the last #include.
-
 const KeyRef fdbClientInfoTxnSampleRate = "config/fdb_client_info/client_txn_sample_rate"_sr;
 const KeyRef fdbClientInfoTxnSizeLimit = "config/fdb_client_info/client_txn_size_limit"_sr;
 
@@ -159,7 +157,7 @@ Future<Version> GlobalConfig::refresh(Version lastKnown, Version largestSeen) {
 	erase(KeyRangeRef(""_sr, "\xff"_sr));
 
 	Backoff backoff(CLIENT_KNOBS->GLOBAL_CONFIG_REFRESH_BACKOFF, CLIENT_KNOBS->GLOBAL_CONFIG_REFRESH_MAX_BACKOFF);
-	loop {
+	while (true) {
 		Error err;
 		try {
 			GlobalConfigRefreshReply reply =
@@ -189,7 +187,7 @@ Future<Version> GlobalConfig::refresh(Version lastKnown, Version largestSeen) {
 // Applies updates to the local copy of the global configuration when this
 // process receives an updated history.
 Future<Void> GlobalConfig::updater(const ClientDBInfo* dbInfo) {
-	loop {
+	while (true) {
 		Error err;
 		try {
 			if (initialized.canBeSet()) {
@@ -202,7 +200,7 @@ Future<Void> GlobalConfig::updater(const ClientDBInfo* dbInfo) {
 				cx->delref();
 			}
 
-			loop {
+			while (true) {
 				// run one iteration at the beginning
 				co_await delay(0);
 				if (!dbInfo->history.empty()) {

fdbclient/SpecialKeySpace.cpp

@@ -40,7 +40,6 @@
 #include "fdbclient/ManagementAPI.h"
 #include "fdbclient/StatusClient.h"
 #include "flow/CoroUtils.h"
-#include "flow/actorcompiler.h" // This must be the last #include.
 
 namespace {
 const std::string kTracingTransactionIdKey = "transaction_id";

fdbrpc/FlowGrpc.cpp

@@ -21,7 +21,6 @@
 #include "fdbrpc/FlowGrpc.h"
 #include "flow/Error.h"
 #include "flow/Trace.h"
-#include "flow/actorcompiler.h" // This must be the last #include.
 
 #ifdef FLOW_GRPC_ENABLED
 
@@ -85,10 +84,10 @@ Future<Void> GrpcServer::runInternal() {
 	// ASSERT(g_network->isOnMainThread()); // Unit-tests are not on main-thread?
 
 	Future<Void> next = Void();
-	loop {
+	while (true) {
 		ASSERT(state_ != State::Shutdown);
 
-		loop {
+		while (true) {
 			co_await next;
 			co_await delay(CONFIG_STARTUP_DELAY_BETWEEN_RESTART);
 

fdbrpc/include/fdbrpc/ActorFuzz.h

@@ -20,7 +20,6 @@
 
 #include "flow/flow.h"
 #include <vector>
-#include "flow/actorcompiler.h"
 
 inline void throw_operation_failed() {
 	throw operation_failed();
@@ -39,5 +38,3 @@ bool testFuzzActor(Future<int> (*actor)(FutureStream<int> const&, PromiseStream<
 // This is defined by ActorFuzz.actor.cpp (generated by actorFuzz.py)
 // Returns (tests passed, tests total)
 std::pair<int, int> actorFuzzTests();
-
-#include "flow/unactorcompiler.h"

fdbrpc/sim2.cpp

@@ -61,8 +61,6 @@
 #include "flow/IUDPSocket.h"
 #include "flow/IConnection.h"
 
-#include "flow/actorcompiler.h" // This must be the last #include.
-
 ISimulator* g_simulator = nullptr;
 thread_local ISimulator::ProcessInfo* ISimulator::currentProcess = nullptr;
 thread_local bool ISimulator::isMainThread = false;
@@ -457,15 +455,15 @@ struct Sim2Conn final : IConnection, ReferenceCounted<Sim2Conn> {
 	}
 
 	static Future<Void> sender(Sim2Conn* self) {
-		loop {
+		while (true) {
 			co_await self->writtenBytes.onChange(); // takes place on peer!
 			ASSERT(g_simulator->getCurrentProcess() == self->peerProcess);
 			co_await delay(.002 * deterministicRandom()->random01());
 			self->sentBytes.set(self->writtenBytes.get()); // or possibly just some sometimes...
 		}
 	}
 	static Future<Void> receiver(Sim2Conn* self) {
-		loop {
+		while (true) {
 			if (self->sentBytes.get() != self->receivedBytes.get())
 				co_await g_simulator->onProcess(self->peerProcess);
 			while (self->sentBytes.get() == self->receivedBytes.get())
@@ -502,7 +500,7 @@ struct Sim2Conn final : IConnection, ReferenceCounted<Sim2Conn> {
 	}
 	static Future<Void> whenReadable(Sim2Conn* self) {
 		try {
-			loop {
+			while (true) {
 				if (self->readBytes.get() != self->receivedBytes.get()) {
 					ASSERT(g_simulator->getCurrentProcess() == self->process);
 					co_return;
@@ -517,7 +515,7 @@ struct Sim2Conn final : IConnection, ReferenceCounted<Sim2Conn> {
 	}
 	static Future<Void> whenWritable(Sim2Conn* self) {
 		try {
-			loop {
+			while (true) {
 				if (!self->peer)
 					co_return;
 				if (self->peer->availableSendBufferForPeer() > 0) {
@@ -1221,7 +1219,7 @@ class Sim2 final : public ISimulator, public INetworkConnections {
 	}
 	static Future<Reference<IConnection>> waitForProcessAndConnect(NetworkAddress toAddr, INetworkConnections* self) {
 		// We have to be able to connect to processes that don't yet exist, so we do some silly polling
-		loop {
+		while (true) {
 			co_await ::delay(0.1 * deterministicRandom()->random01());
 			if (g_sim2.addressMap.contains(toAddr)) {
 				Reference<IConnection> c = co_await self->connect(toAddr);