More actorcompiler.h fixes and additions.

bindings/flow/tester/Tester.actor.h

@@ -32,6 +32,7 @@
 #include "bindings/flow/IDirectory.h"
 #include "bindings/flow/Subspace.h"
 #include "bindings/flow/DirectoryLayer.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 #define LOG_ALL 0
 #define LOG_INSTRUCTIONS LOG_ALL || 0
@@ -239,4 +240,5 @@ Future<decltype(fake<F>()().getValue())> executeMutation(Reference<InstructionDa
 	}
 }
 
+#include "flow/unactorcompiler.h"
 #endif

fdbclient/RunTransaction.actor.h

@@ -29,6 +29,7 @@
 
 #include "flow/flow.h"
 #include "ReadYourWrites.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 ACTOR template < class Function >
 Future<decltype(fake<Function>()(Reference<ReadYourWritesTransaction>()).getValue())>
@@ -72,4 +73,6 @@ runRYWTransactionNoRetry(Database cx, Function func) {
 	wait(tr->commit());
 	return result;
 }
-#endif
+
+#include "flow/unactorcompiler.h"
+#endif

fdbclient/VersionedMap.actor.h

@@ -28,6 +28,7 @@
 	#define FDBCLIENT_VERSIONEDMAP_ACTOR_H
 
 #include "flow/flow.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 ACTOR template <class Tree>
 Future<Void> deferredCleanupActor( std::vector<Tree> toFree, int taskID = 7000 ) {
@@ -48,4 +49,5 @@ Future<Void> deferredCleanupActor( std::vector<Tree> toFree, int taskID = 7000 )
 	return Void();
 }
 
-#endif
+#include "flow/unactorcompiler.h"
+#endif

fdbrpc/AsyncFileBlobStore.actor.h

@@ -37,6 +37,7 @@
 #include "BlobStore.h"
 #include "md5/md5.h"
 #include "libb64/encode.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 ACTOR template<typename T> static Future<T> joinErrorGroup(Future<T> f, Promise<Void> p) {
 	try {
@@ -291,4 +292,5 @@ public:
 
 };
 
+#include "flow/unactorcompiler.h"
 #endif

fdbrpc/AsyncFileCached.actor.h

@@ -32,6 +32,7 @@
 #include "flow/Knobs.h"
 #include "flow/TDMetric.actor.h"
 #include "flow/network.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 struct EvictablePage {
 	void* data;
@@ -493,4 +494,5 @@ struct AFCPage : public EvictablePage, public FastAllocated<AFCPage> {
 	int zeroCopyRefCount;  // references held by "zero-copy" reads
 };
 
+#include "flow/unactorcompiler.h"
 #endif

fdbrpc/AsyncFileEIO.actor.h

@@ -31,14 +31,15 @@
 #elif !defined(FLOW_ASYNCFILEEIO_ACTOR_H)
 	#define FLOW_ASYNCFILEEIO_ACTOR_H
 
+#include <fcntl.h>
+#include <sys/stat.h>
+
 #include "eio.h"
 #include "flow/flow.h"
 #include "flow/ThreadHelper.actor.h"
 #include "IAsyncFile.h"
 #include "flow/TDMetric.actor.h"
-
-#include <fcntl.h>
-#include <sys/stat.h>
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 class AsyncFileEIO : public IAsyncFile, public ReferenceCounted<AsyncFileEIO> {
 
@@ -439,5 +440,6 @@ private:
 volatile int32_t AsyncFileEIO::want_poll = 0;
 #endif
 
+#include "flow/unactorcompiler.h"
 #endif 
 #endif

fdbrpc/AsyncFileKAIO.actor.h

@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include "flow/Hash3.h"
 #include "flow/genericactors.actor.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 // Set this to true to enable detailed KAIO request logging, which currently is written to a hardcoded location /data/v7/fdb/
 #define KAIO_LOGGING 0
@@ -830,5 +831,6 @@ TEST_CASE("fdbrpc/AsyncFileKAIO/RequestList") {
 
 AsyncFileKAIO::Context AsyncFileKAIO::ctx;
 
+#include "flow/unactorcompiler.h"
 #endif 
 #endif

fdbrpc/AsyncFileNonDurable.actor.h

@@ -33,6 +33,7 @@
 #include "simulator.h"
 #include "TraceFileIO.h"
 #include "RangeMap.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 #undef max
 #undef min
@@ -753,4 +754,5 @@ private:
 	}
 };
 
+#include "flow/unactorcompiler.h"
 #endif

fdbrpc/AsyncFileReadAhead.actor.h

@@ -29,6 +29,7 @@
 
 #include "flow/flow.h"
 #include "IAsyncFile.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 // Read-only file type that wraps another file instance, reads in large blocks, and reads ahead of the actual range requested
 class AsyncFileReadAheadCache : public IAsyncFile, public ReferenceCounted<AsyncFileReadAheadCache> {
@@ -192,4 +193,5 @@ public:
 
 };
 
-#endif
+#include "flow/unactorcompiler.h"
+#endif

fdbserver/StorageMetrics.actor.h

@@ -25,6 +25,7 @@
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "Knobs.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 struct StorageMetricSample {
 	IndexedSet<Key, int64_t> sample;
@@ -402,3 +403,5 @@ struct ByteSampleInfo {
 //Determines whether a key-value pair should be included in a byte sample
 //Also returns size information about the sample
 ByteSampleInfo isKeyValueInSample(KeyValueRef keyValue);
+
+#include "flow/unactorcompiler.h"

fdbserver/workloads/AsyncFile.actor.h

@@ -29,6 +29,7 @@
 
 #include "workloads.h"
 #include "fdbrpc/IAsyncFile.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 class RandomByteGenerator{
 private:
@@ -155,4 +156,5 @@ struct AsyncFileWorkload : TestWorkload
 	}
 };
 
+#include "flow/unactorcompiler.h"
 #endif

fdbserver/workloads/BulkSetup.actor.h

@@ -34,7 +34,6 @@
 #include "fdbserver/ServerDBInfo.h"
 #include "fdbserver/QuietDatabase.h"
 #include "fdbrpc/simulator.h"
-
 #include "flow/actorcompiler.h"  // This must be the last #include.
 
 ACTOR template<class T>

flow/ThreadHelper.actor.h

@@ -29,6 +29,7 @@
 		#define FLOW_THREADHELPER_ACTOR_H
 
 #include "flow/flow.h"
+#include "flow/actorcompiler.h"  // This must be the last #include.
 
 // template <class F>
 // void onMainThreadVoid( F f ) {
@@ -629,4 +630,5 @@ private:
 	ThreadSpinLock lock;
 };
 
+#include "flow/unactorcompiler.h"
 #endif